diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
index f2c9898422d7ac498c6ae02f8d02939020ad8875..ed502c40f6475c6cde74096b35cb37477a0909a7 100644
--- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
+++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict
@@ -57,7 +57,7 @@ functions
type surfaces;
surfaceFormat boundaryData;
writeControl timeStep;
- writeInterval 10;
+ writeInterval 100;
interpolationScheme cell;
fields
(
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..94f799b4624d65cdc005bcfd0a69460c5105b288
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+#------------------------------------------------------------------------------
+
+(cd steadyState && ./Allclean)
+
+(cd transient && ./Allclean)
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
index a33cc4cb3803efe106d4695c762bdf63557d4822..5e577cba00e96873102f5e3822664fc7e243bed4 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
@@ -1,6 +1,5 @@
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
-. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
(cd steadyState && ./Allrun)
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..fb1f3847301c377e02e12439ba58cbf303af3ef9
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
index 7d5ae7836871e799720b077e77e776100421141c..7617e7e91dd92aab660563bc67ff31eecaebfc74 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
@@ -31,11 +31,10 @@ vertices
blocks
(
- hex (0 1 2 3 4 5 6 7) (200 160 80) simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1)
+ hex (0 1 2 3 4 5 6 7) (200 160 80)
+ simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1)
);
-
-
edges #codeStream
{
codeInclude
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
index 8fc20ec2de93ef2518997d64d73d7eb5dedca097..4b38d441a4bfbeb673006581c78a1e23e91c153f 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict
@@ -105,12 +105,17 @@ functions
{
type sets;
libs (sampling);
- writeControl writeTime;
- timeStart 1500.5; // approx 2x flow-throughs
-
interpolationScheme cellPoint;
+ setFormat raw;
+ executeControl onEnd;
+ writeControl onEnd;
- setFormat raw;
+ fields
+ (
+ U
+ columnAverage:columnAverage(UMean)
+ columnAverage:columnAverage(UPrime2Mean)
+ );
sets
(
@@ -185,14 +190,6 @@ functions
end (0.224 1 0.063);
}
);
-
-
- fields
- (
- U
- columnAverage:columnAverage(UMean)
- columnAverage:columnAverage(UPrime2Mean)
- );
}
}
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
index 3ee1dd39d079cba82e4bade0ca256c887fb25542..c0a54d302aa59414438ef8d0e87e68a66d78f3a8 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs (turbulenceModelSchemes);
+libs (turbulenceModelSchemes);
application pimpleFoam;
@@ -54,6 +54,7 @@ functions
libs (fieldFunctionObjects);
fields (U p);
}
+
DESField
{
// Mandatory entries
diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
index b79002dc8e2997740fe3018bd2867d366dde53d5..119306db68dd20c33ca8088dc04c5cfb7bdb42ec 100644
--- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
+++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample
@@ -16,7 +16,7 @@ FoamFile
type sets;
libs (sampling);
-writeControl writeTime;
+writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
index 26381a9396d5dc97ca0c791103e358d147e14d97..bd6fc7ab66e58eb2d6805a8d5532378adef73524 100644
--- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict
@@ -80,8 +80,8 @@ functions
log true;
timeStart 100;
timeEnd 1000;
- executeControl timeStep;
- executeInterval 1;
+ executeControl runTime;
+ executeInterval 10;
}
curlePoint
@@ -108,8 +108,8 @@ functions
log true;
timeStart 100;
timeEnd 1000;
- executeControl timeStep;
- executeInterval 1;
+ executeControl runTime;
+ executeInterval 10;
}
cuttingPlane
diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
index bc4fce46745100fdcfe976b048084f833ed3acad..14a680f0e7c4d50f455b772c5f83558a09e01a3d 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
+++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite
@@ -18,7 +18,7 @@ ensightWrite
overwrite true;
- writeControl writeTime;
+ writeControl onEnd;
consecutive false;
}
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
index 56476c469dc9de082d8ec18df5b160a76c4a767f..94f3ddf56258e679a68af17c7731e6e522465f15 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization
@@ -11,7 +11,7 @@
// Timing
_visualization
{
- writeControl writeTime;
+ writeControl onEnd;
// enabled true;
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
index fa2ae2cdd69b6981c1adca45ac9ac891268e3db0..a3ed4352a49e96549766b48ecbe4cee85804361b 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +68,6 @@ functions
(0.1524 0.0253 0)
(0.1778 0.0253 0)
);
-
}
fieldAverage1
@@ -101,7 +99,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
index 06518a1ad5b914d057bf725db59b9218a60d6040..e404a0fb5f79784f9a8833a5a94fe4187c58bd50 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict
@@ -99,7 +99,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
index 485c9900329aef2bb8a74bbcadff4858c4e36d6a..5b1a16fa6688e3e1dea3d3e98db4eabbcac72a48 100644
--- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
+++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample
@@ -1,7 +1,7 @@
type sets;
libs (sampling);
-writeControl writeTime;
+writeControl onEnd;
interpolationScheme cellPoint;
diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
index 7be851a4cf82766f0d5978500b65889b490d94bd..4a8c98ea2f2f3b3712659e35d1bb29f806806134 100755
--- a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
+++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun
@@ -11,7 +11,6 @@ cd "${0%/*}" || exit # Run from this directory
runApplication snappyHexMesh -overwrite
runApplication renumberMesh -overwrite
runApplication createPatch -overwrite
-
)
# Make a 2D mesh by extruding a patch and solve to steady state.
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
index 82757258457a95f8d43b621b4a117c3b2e198bf1..2f8c4acac30c5109f6475d897526d23c6710a558 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict
@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
surfaceFormat raw;
fields
(
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
index 6a6c59d18d24e7387b887e08a91bcdd25bd9dff2..f363f85909170b15ba2e7ca9e3b1ddb78d02905e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict
@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
surfaceFormat raw;
fields
(
diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
index 6a6c59d18d24e7387b887e08a91bcdd25bd9dff2..f363f85909170b15ba2e7ca9e3b1ddb78d02905e 100644
--- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict
@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
surfaceFormat raw;
fields
(
diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
index 1da8e0814ea40a4154c58d5eed4d729aa7232ca3..94d8d33b8504f25caba69117e583d34e5394efcc 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict
@@ -59,11 +59,17 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U
+ alpha.water
+ );
sets
(
@@ -107,7 +113,6 @@ functions
end ( 7.5 0.005 0.8 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -133,12 +138,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
index a679cdd8880bd0aeeb0662b8b29ecdb98b1beab2..9e4fa497fc123973c37a9288c3e3beb2e190c543 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict
@@ -59,11 +59,17 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U alpha.water
+ );
+
sets
(
line1
@@ -74,14 +80,6 @@ functions
end ( 7.9253 19.8599 30.0 );
nPoints 1001;
}
-
- );
-
- fixedLocations false;
-
- fields
- (
- U alpha.water
);
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
index 8e70940bf43fc08b676081848d4b4edc3fa6e692..28f23bc0c8f3733c7b46e912968e6309b6988183 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict
@@ -60,10 +60,20 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ p
+ p_rgh
+ U
+ alpha.water
+ );
+
sets
(
s1
@@ -147,13 +157,6 @@ functions
nPoints 101;
}
);
-
- fixedLocations false;
-
- fields
- (
- p p_rgh U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
index 62de4ebb1ebdaa1a46edd6c0db9886acb0cf79e1..b49f2b2ec6063cd15801bd9142e183aa9b131a09 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,11 +59,17 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U alpha.water
+ );
+
sets
(
line1
@@ -107,7 +112,6 @@ functions
end ( 7.5 0.01 1.5 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -117,12 +121,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
index 9389a10a7b610fa00ea80775876270ab3b1f8c5f..6f60258c9907c5b72064a38be13d065ff2c8a402 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict
@@ -59,7 +59,7 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
index 52c0e356a0901896dd159c82dbd64f9e08044f70..6e3a0a44e72ed13e1f2611fc33a2921c7bae67b6 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict
@@ -59,7 +59,7 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
index ddb56a5171b4c5cecf76104cbd2335276b9c8ce1..4133bbef9538ff17d1dc415e5008bfce54979e4e 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,11 +59,18 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U
+ alpha.water
+ );
+
sets
(
line1
@@ -107,7 +113,6 @@ functions
end ( 7.5 0.02 0.75 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -133,12 +138,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
index f25a7a25077a613ac1aca4c8169191c4a345a46b..59316cb5d6c26283515a526f81c363ef49565d97 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,11 +59,18 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U
+ alpha.water
+ );
+
sets
(
line1
@@ -107,7 +113,6 @@ functions
end ( 7.5 0.02 0.55 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -133,12 +138,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
index a99c2d74d0cad08c1ed831f20bbbdf55d16054f4..ec2badabfb189e067aacc7d05bc7c58abbfd7f6a 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict
@@ -59,11 +59,17 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U
+ alpha.water
+ );
sets
(
@@ -107,7 +113,6 @@ functions
end ( 5 0.005 0.8 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -133,13 +138,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
-
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
index 2a978090c3da535b84e7e0579d3628fe32a0b4a3..81bb0ab9a655e58a459e696a2b3000164d429483 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,11 +59,18 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields
+ (
+ U
+ alpha.water
+ );
+
sets
(
line1
@@ -107,7 +113,6 @@ functions
end ( 7.5 0.005 1.0 );
nPoints 1001;
}
-
line6
{
type uniform;
@@ -149,12 +154,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
- fields
- (
- U alpha.water
- );
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
index e5297bac7454a175a6c82661c814462c3a6b2b04..0dfcaaa7611b60916c7c3217fcbc02f7cdda919c 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict
@@ -59,10 +59,13 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields (alpha.water);
sets
(
@@ -129,10 +132,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
-
- fields (alpha.water);
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
index 6f6f1820778d0ae65a08e76b034f3e48a3fa6568..7d7ae721c439c3247041f9b15bb3101713c1a90f 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,7 +59,7 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
index 8547c84721bfb5be9adfc4b2481e27325426e29a..5c4178951618e578d851353d82f252afe2ef8186 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict
@@ -52,7 +52,6 @@ maxAlphaCo 0.65;
maxDeltaT 0.05;
-
functions
{
line
@@ -60,10 +59,13 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
+ fixedLocations false;
+
+ fields (alpha.water);
sets
(
@@ -130,10 +132,6 @@ functions
nPoints 1001;
}
);
-
- fixedLocations false;
-
- fields (alpha.water);
}
}
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
index e5297bac7454a175a6c82661c814462c3a6b2b04..7ba2686db03c88adb1ada512f45bd1b59e326b90 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict
@@ -59,7 +59,7 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
index 686e0ab678c816c3f9ce949ada39797970032e5a..b5bfe00939ea4eb5863a25bd32bbee1183607c77 100644
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict
@@ -57,10 +57,9 @@ functions
lineMOVING
{
type sets;
- libs (sampling);
+ libs (sampling);
enabled true;
- writeControl writeTime;
- outputInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
@@ -68,21 +67,20 @@ functions
(
line1
{
- type uniform;
- axis distance;
+ 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;
+ type uniform;
+ axis distance;
start ( 3.33 0.004 0.0 );
end ( 3.33 0.004 0.6 );
nPoints 101;
}
-
);
fixedLocations false;
@@ -95,10 +93,9 @@ functions
lineFIXED
{
type sets;
- libs (sampling);
+ libs (sampling);
enabled true;
- writeControl writeTime;
- outputInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
@@ -106,16 +103,16 @@ functions
(
line3
{
- type uniform;
- axis distance;
+ 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;
+ type uniform;
+ axis distance;
start ( 5.66 0.004 0.0 );
end ( 5.66 0.004 0.6 );
nPoints 101;
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
index f4400b92b9fb41fa94cea5d85edc20204c46e9d5..8aae30e0ed6c630e073bdf2ccd2d29c385123731 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U
@@ -37,4 +37,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
index be5471701ce99b5127c455b5d5f1cbd9b6b1fa8c..aca52b40d6cdf639706b6754265a0584803fc6f8 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water
@@ -36,4 +36,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
index 2e5c06a4581b7fe5471c14d641a1616f7496e81b..8eaf0a1284acf878756303f385d920744147ee1d 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh
@@ -36,4 +36,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
index 5c1363c36f186c1e372991fbe46b5bbd68078656..a79cc4085dfec1089665403ee5548ac371e4fade 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object dynamicMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
index 9d032f2c53bd4539b256f773f7d3cb2fd1083996..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class uniformDimensionedVectorField;
- location "constant";
object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
index a0163959c37cddbf761ea244e775f6f89cf90a1e..d4fcfa9c5d5eb4e76ba4691e4912aafbf8f89c17 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phases (water air);
+phases (water air);
water
{
@@ -33,4 +32,5 @@ air
sigma 0;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
index c248a5b18b340c68a025e12c9df94c74377d98cc..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
index 3e8d8ea54577501f505dc013cd6c93cbc6b881ea..67a1ac561e8fc3e15d8eeaf7c3cf1dc80870cd09 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo 0.5;
maxDeltaT 1;
-
functions
{
probes
@@ -77,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
- writeControl writeTime;
+ writeControl onEnd;
surfaceFormat raw;
fields
(
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
index df13f4e670707bcb89e06456400826778d225b07..d569ffffc01e6d0b8527cd6799c00b49fa9b194c 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
n (1 3 2);
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
index b19cf748eaef9aca80abac02140f407528651e92..057df3add783434d427e0be1ea1b8cc5678ea9a8 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,4 +47,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
index 13dfd7118ea9e79356c807b41e863df199a42525..413adf60cae15eb3c07cb3f51970dcfacc275c01 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,7 +67,6 @@ solvers
smoother DICGaussSeidel;
nPreSweeps 2;
}
-
tolerance 2e-09;
relTol 0;
maxIter 20;
diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
index 39cff1bf12c499544a880157eba4ccbac1fc5de2..a09f27caa04daa40edb3bb8f1637353a31aa5c50 100644
--- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
index 7bc6acf72cc6226111031d4fa632a8f11cf5dc73..424ae008701e1333a87b3f288d947f8050e1d4b9 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U
@@ -50,4 +50,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
index 62552cce513fde7d39c2c430b0994ae3e1b6e20b..841420a68788dd753513a876a3de54ca02e27178 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water
@@ -49,4 +49,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
index 688353da1a9822dfd2745a47a0820e4c3c6a37bf..8ef179a19974d359c85bf510ac3310ae99d034f4 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class uniformDimensionedVectorField;
- location "constant";
object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
index 8d12d4c2c326377aafb8acd8ce4e63140b8b8d6e..9c82b5013b05e2949e479201047cb264bf970574 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties
@@ -10,12 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-phases (water air);
+phases (water air);
water
{
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
index 2ba9fa4efe4f81f6845563455a300c654553dcdb..9bc049b7c712e4db2c3836d59c81e13e00ae69bb 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
index 88b372c23dc7b21635f4e5d6a18da943b4d42ebc..86e96553c43ef84a811f5c6e01b059021f48ef0b 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object waveProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,7 +26,7 @@ inlet
waveAngle 0.0;
- rampTime 3.017;//6.034;
+ rampTime 3.017;
activeAbsorption yes;
@@ -64,7 +63,6 @@ inlet
2.7580059e-004
2.2810557e-004
);
-
}
outlet
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
index 5177f8d76badbf130d09c4b92ae1b923ceecc73a..0eb3b2b67ac621def833fb6f3098f3892178a15f 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict
@@ -86,4 +86,5 @@ mergePatchPairs
(
);
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
index ef0ef886092e4d2f73051f086f1fa3fb6f9cf0f4..6c88a52a1586292231f82fd615fca5221b491d44 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,7 +52,6 @@ maxAlphaCo 0.5;
maxDeltaT 0.5;
-
functions
{
line
@@ -61,8 +59,7 @@ functions
type sets;
libs (sampling);
enabled true;
- writeControl writeTime;
- writeInterval 1;
+ writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
@@ -108,7 +105,6 @@ functions
end ( 7.5 0.005 1.0 );
nPoints 1001;
}
-
line6
{
type uniform;
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
index acf0e87d15976c917ed989e659ffe0b54acc4d0e..bd5b1a36daaa03bf8e0cc9481a9bf325d717f5f7 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict
@@ -23,4 +23,5 @@ coeffs
n (2 1 1);
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
index 5b9e2ac730d30da37a0adc119e64e9c47ea475cc..cb9dc6c025cee39f2219fe482975b4b38a47ae06 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
index ea39fef94f6708c22108445fe9cc592c1c016b6c..0df413c31bb10ab7f065e3e8095ec429343aec40 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
index ad53914da368090cb57757517021f35900caf667..7c6ac00b785555fa57ce72d9ebe53a4ea297affe 100644
--- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/epsilon
deleted file mode 100644
index 4418cd4a6b4a8828799468f18cfff0c968f1abb8..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/epsilon
+++ /dev/null
@@ -1,76 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -3 0 0 0 0];
-
-internalField uniform 0.1;
-
-boundaryField
-{
- #includeEtc "caseDicts/setConstraintTypes"
-
- "overset.*"
- {
- type overset;
- value uniform 1;
- }
-
- hullWall
- {
- type epsilonWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0.1;
- }
-
- propellerWall
- {
- type epsilonWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0.1;
- }
-
- rudderWall
- {
- type epsilonWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0.1;
- }
-
- atmosphere
- {
- type inletOutlet;
- inletValue uniform 0.1;
- value uniform 0.1;
- }
-
- defaultFaces
- {
- type epsilonWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0.1;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/nut
deleted file mode 100644
index c9850746adf0a387dbd8876400674a1929f16bde..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/nut
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object nut;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -1 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- #includeEtc "caseDicts/setConstraintTypes"
-
- "overset.*"
- {
- type overset;
- value uniform 1;
- }
-
- hullWall
- {
- type nutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-
- propellerWall
- {
- type nutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-
- rudderWall
- {
- type nutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-
- atmosphere
- {
- type calculated;
- value uniform 0;
- }
-
- defaultFaces
- {
- type nutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre
deleted file mode 100755
index aa410bf0724877fc340a1737e4d9f5a1cc975124..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit # Run from this directory
-. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
-#------------------------------------------------------------------------------
-
-runApplication blockMesh
-
-#runApplication -s 1 topoSet -dict system/topoSetDictRefine
-#runApplication -s 1 refineMesh -overwrite -dict system/refineMeshDict
-runApplication -s 1 topoSet -dict system/topoSetDictRefine
-runApplication -s 1 refineMesh -overwrite -dict system/refineMeshDict.2
-
-runApplication -s 2 topoSet -dict system/topoSetDictRefine
-runApplication -s 2 refineMesh -overwrite -dict system/refineMeshDict.2
-
-runApplication -s 7 topoSet -dict system/topoSetDictRefine.3
-runApplication -s 7 refineMesh -overwrite -dict system/refineMeshDict.2
-
-runApplication -s 8 topoSet -dict system/topoSetDictRefine.4
-runApplication -s 8 refineMesh -overwrite -dict system/refineMeshDict.2
-
-# Select cellSets
-runApplication -s hull topoSet -dict system/topoSetDictHull
-runApplication -s hull subsetMesh keepBox -patch hullWall -overwrite
-
-# Select cellSets
-runApplication -s propeller topoSet -dict system/topoSetDictPropeller
-runApplication -s propeller subsetMesh keepBox -patch propellerWall -overwrite
-
-# Select cellSets
-runApplication -s rudder topoSet -dict system/topoSetDictRudder
-runApplication -s rudder subsetMesh keepBox -patch rudderWall -overwrite
-
-restore0Dir
-
-# Use cellSets to write zoneID
-runApplication -s 1 setFields -dict system/setFieldsDict
-runApplication -s 2 setFields -dict system/setFieldsDictWaterLevel
-
-touch boatAndPropeller.foam
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
deleted file mode 100644
index 3defe7b552a911245a6616cd3b66fb7def7b1c75..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict
+++ /dev/null
@@ -1,161 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object dynamicMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-motionSolverLibs (rigidBodyMeshMotion);
-
-dynamicFvMesh dynamicOversetFvMesh;
-
-motionSolver rigidBodyMotion;
-
-report on;
-
-solver
-{
- type Newmark;
- //gamma 0.1; // Velocity integration coefficient
- //beta 0.1; // Position integration coefficient
-}
-
-accelerationRelaxation 0.4;
-
-// prescribedRotation requires some sub-iterations to converge faster
-// to desired value of omega.
-nIter 3;
-
-bodies
-{
- hull
- {
- type rigidBody;
- parent root;
-
- // To get Tensor of Inertia (symmetrical) use surfaceInertia
- // here hull is empty shell
-
- mass 0.552;
- inertia (0.0033 0 0 0.01 0 0.0095);
- centreOfMass (0.2857 -0.07 0); // relative to the centreOfMass
- // of parent body
- // (here root = global coord system)
-
- // Transformation tensor and centre of rotation (CoR)
- transform (1 0 0 0 1 0 0 0 1) (0.2857 -0.07 0);
-
- joint
- {
- // These constrains are applied only to body hull,
- // other bodies need to have their own set
- // Constraints used for faster run
-
- type composite;
- joints
- (
- {
- type Px; // Allow translation in X -
- }
- {
- type Ry; // Allow rotation along Y axis
- // (local - body CS)
- }
- );
- }
-
- patches (hullWall);
- innerDistance 100; // With overset we want to avoid the mesh
- // deformation so have large innerDistance
- outerDistance 200;
- }
-
- propeller
- {
-
- type rigidBody;
- parent hull;
-
- centreOfMass (-0.2847 0.03 0); // Relative to parent CoM
- mass 0.0288;
- inertia (7.6e-6 0 0 4.2e-6 0 4.2e-6);
- // transform and CoR - relative to parent CoR
- transform (1 0 0 0 1 0 0 0 1) (-0.2757 0.03 0);
- patches (propellerWall);
- innerDistance 100;
- outerDistance 200;
- joint
- {
- type Rx;
- }
- }
-
- rudder
- {
- type rigidBody;
- parent hull;
- centreOfMass (-0.3602 -0.0055 0);
- mass 0.0746;
- inertia (3.3e-5 0 0 4.7e-6 0 3.4e-5);
- // transform and CoR - relative to parent CoR
- transform (1 0 0 0 1 0 0 0 1) (-0.3487 -0.04 0);
- patches (rudderWall);
- innerDistance 100;
- outerDistance 200;
- joint
- {
- type Ry;
- }
- }
-}
-
-restraints
-{
- rudderRotation
- {
- type prescribedRotation;
- body rudder;
- referenceOrientation (1 0 0 0 1 0 0 0 1);
- axis (0 1 0); // Axis of rotation
- relax 0.5;
- p 0.5;
- i 0.5;
- d 0.5;
- omega sine; // Function1 entry
- omegaCoeffs
- {
- frequency 4;
- amplitude 0.2;
- scale (0 1 0);
- level (0 1 0);
- }
- }
- propellerRotation
- {
- type prescribedRotation;
- body propeller;
- referenceOrientation (1 0 0 0 1 0 0 0 1);
- axis (1 0 0);
- relax 0.5;
- p 0.5;
- i 0.5;
- d 0.5;
- omega table
- (
- (0 (0 0 0))
- (1 (16 0 0))
- );
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict
deleted file mode 100644
index 3d932902b6fe48519a4508744266d0303bf65024..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict
+++ /dev/null
@@ -1,152 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-scale 1;
-
-vertices
-(
- // backgroundMesh
- ( -0.50 -0.5 -0.7) // 0
- ( 1.00 -0.5 -0.7)
- ( 1.00 0.5 -0.7)
- ( -0.50 0.5 -0.7)
- ( -0.50 -0.5 0.7) // 4
- ( 1.00 -0.5 0.7)
- ( 1.00 0.5 0.7)
- ( -0.50 0.5 0.7)
-
- // hullBox
- ( 0.045 -0.14 -0.15) // 8
- ( 0.60 -0.14 -0.15)
- ( 0.60 0.10 -0.15) // 10
- ( 0.045 0.10 -0.15)
- ( 0.045 -0.14 0.15) // 12
- ( 0.60 -0.14 0.15)
- ( 0.60 0.10 0.15) // 14
- ( 0.045 0.10 0.15)
-
- // propeller
- ( -0.02 -0.08 -0.04) // 16
- ( 0.04 -0.08 -0.04)
- ( 0.04 0.00 -0.04) // 18
- ( -0.02 0.00 -0.04)
- ( -0.02 -0.08 0.04) // 20
- ( 0.04 -0.08 0.04)
- ( 0.04 0.00 0.04) // 22
- ( -0.02 0.00 0.04)
-
- // rudder
- ( -0.10 -0.14 -0.02) // 24
- ( -0.04 -0.14 -0.02)
- ( -0.04 -0.02 -0.02) // 26
- ( -0.10 -0.02 -0.02)
- ( -0.10 -0.14 0.02) // 28
- ( -0.04 -0.14 0.02)
- ( -0.04 -0.02 0.02) // 30
- ( -0.10 -0.02 0.02)
-);
-
-blocks
-(
- // hex (0 1 2 3 4 5 6 7) background (60 40 56)
- // simpleGrading (1 1 1) // coarser mesh cell size 0.025 m
- hex (0 1 2 3 4 5 6 7) background (75 50 70)
- simpleGrading (1 1 1) // cell size 0.02 m
- hex (8 9 10 11 12 13 14 15) hullBox (32 16 16) simpleGrading (1 1 1)
- hex (16 17 18 19 20 21 22 23) propeller (10 20 20) simpleGrading (1 1 1)
- hex (24 25 26 27 28 29 30 31) rudder (20 22 11) simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
- overset1 //oversetHull
- {
- type overset;
- faces
- (
- ( 8 12 15 11)
- (10 14 13 9)
- (11 15 14 10)
- ( 9 13 12 8)
- ( 9 8 11 10)
- (12 13 14 15)
- );
- }
- overset2 //oversetPropeller
- {
- type overset;
- faces
- (
- (16 20 23 19)
- (18 22 21 17)
- (19 23 22 18)
- (17 21 20 16)
- (20 21 22 23)
- (19 18 17 16)
- );
- }
- overset3 //oversetRudder
- {
- type overset;
- faces
- (
- (24 28 31 27)
- (26 30 29 25)
- (28 29 30 31)
- (25 24 27 26)
- (27 31 30 26)
- (24 25 29 28)
- );
- }
- // Populated by subsetMesh
- hullWall
- {
- type wall;
- faces ();
- }
- propellerWall
- {
- type wall;
- faces ();
- }
- rudderWall
- {
- type wall;
- faces ();
- }
- atmosphere
- {
- type patch;
- faces
- (
- (3 7 6 2)
- // (1 5 4 0)
- );
- }
- defaultFaces
- {
- type wall;
- faces
- ();
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
deleted file mode 100644
index dd6106d7ce9e653dfecb6709035678afc5370459..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
+++ /dev/null
@@ -1,103 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
- {
- name bgr0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone background;
- }
- {
- name hullBox0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone hullBox;
- }
- {
- name propeller0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone propeller;
- }
- {
- name rudder0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone rudder;
- }
-
- {
- name box; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set hullBox0;
- }
-
- {
- name box; // hole in mesh
- type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (0.12 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
- );
- }
-
- {
- name box;
- type cellSet;
- action invert;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set box;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set propeller0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set rudder0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set bgr0;
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
deleted file mode 100644
index 798774e223aad194eec77fff4ddc10ae2bdb0c66..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
+++ /dev/null
@@ -1,103 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
- {
- name bgr0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone background;
- }
- {
- name hullBox0; // all around hull
- type cellSet;
- action new;
- source zoneToCell;
- zone hullBox;
- }
- {
- name propeller0; // all around propeller
- type cellSet;
- action new;
- source zoneToCell;
- zone propeller;
- }
- {
- name rudder0; // all around rudder
- type cellSet;
- action new;
- source zoneToCell;
- zone rudder;
- }
-
- {
- name box; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set propeller0;
- }
-
- {
- name box; // hole in mesh
- type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (0.005 -0.061 -0.0199)( 0.018 -0.0199 0.0199) //propeller
- );
- }
-
- {
- name box;
- type cellSet;
- action invert;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set box;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set rudder0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set hullBox0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set bgr0;
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4
deleted file mode 100644
index 462dd6d94fe4a155983b92c6e3927373294d56f8..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
- {
- name refineSet; // background around hullBox
- type cellSet;
- action new;
- source zoneToCell;
- zone background;
- }
- {
- name refineSet;
- type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (0.05 -0.2 -0.2)(0.8 0.2 0.2)
- );
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
deleted file mode 100644
index dfe58ab51445ce8e5ae6afcc89153dbba2b88d94..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
+++ /dev/null
@@ -1,103 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
- {
- name bgr0; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone background;
- }
- {
- name hullBox0; // all around hull
- type cellSet;
- action new;
- source zoneToCell;
- zone hullBox;
- }
- {
- name propeller0; // all around propeller
- type cellSet;
- action new;
- source zoneToCell;
- zone propeller;
- }
- {
- name rudder0; // all around rudder
- type cellSet;
- action new;
- source zoneToCell;
- zone rudder;
- }
-
- {
- name box; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set rudder0;
- }
-
- {
- name box; // hole in mesh
- type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (-0.09 -0.12 -0.00499)(-0.059 -0.03 0.00499) //rudder
- );
- }
-
- {
- name box;
- type cellSet;
- action invert;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action new;
- source cellToCell;
- set box;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set propeller0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set hullBox0;
- }
- {
- name keepBox; //all cells
- type cellSet;
- action add;
- source cellToCell;
- set bgr0;
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allclean b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..4e2539ba2f0b7879a38aca09e6fd100a4f8b2127
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+#-----------------------------------------------------------------------------
+
+(cd overset-1 && ./Allclean)
+
+(cd overset-2 && ./Allclean)
+
+(cd background && ./Allclean)
+
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allrun b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..fb1b35c00f3e5fb575dd91a21b38c33fff82e20c
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/Allrun
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+#-----------------------------------------------------------------------------
+
+(cd overset-1 && ./Allrun)
+
+(cd overset-2 && ./Allrun)
+
+(cd background && ./Allrun)
+
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
similarity index 77%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
index f3e40d809df4fa94a938464af587f479807af4e2..7cabd46e0359e85b82b8f5182e57f78eab5b9cf8 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/U
@@ -22,29 +22,34 @@ boundaryField
{
#includeEtc "caseDicts/setConstraintTypes"
- defaultFaces
+ "(BLADES|HUB_DISK|HUB|HUB_COVER|HULL*.*)"
{
- type uniformFixedValue;
- uniformValue (0 0 0);
+ type movingWallVelocity;
+ value uniform (0 0 0);
}
- "(hullWall|propellerWall|rudderWall)"
+ inlet
{
- type movingWallVelocity;
+ type fixedValue;
+ value $internalField;
+ }
+
+ outlet
+ {
+ type inletOutlet;
value uniform (0 0 0);
+ inletValue uniform (0 0 0 );
}
- atmosphere
+ "(atmosphere)"
{
type pressureInletOutletVelocity;
- value uniform (0 0 0);
+ value $internalField;
}
- "overset.*"
+ "(overset-1|oversetPatch)"
{
- type overset;
- patchType overset;
- value uniform (0 0 0);
+ type overset;
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
similarity index 74%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/alpha.water
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
index eb8f12d95cf35ffcb0c0ff9ef5a8cc0670722b2a..e0d133917348f70195588d0a377878fd355a3b2c 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/alpha.water
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/alpha.water
@@ -22,35 +22,22 @@ boundaryField
{
#includeEtc "caseDicts/setConstraintTypes"
- "overset.*"
+ "(outlet|inlet)"
{
- type overset;
- value uniform 1;
- }
-
- hullWall
- {
- type zeroGradient;
- }
-
- propellerWall
- {
- type zeroGradient;
- }
-
- rudderWall
- {
- type zeroGradient;
+ type variableHeightFlowRate;
+ lowerBound 0;
+ upperBound 1;
+ value $internalField;
}
atmosphere
{
type inletOutlet;
- inletValue uniform 0;
- value uniform 0;
+ inletValue $internalField;
+ value $internalField;
}
- defaultFaces
+ "(BLADES|HUB_DISK|HUB|HUB_COVER|HULL).*"
{
type zeroGradient;
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
similarity index 59%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/zoneID
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
index 7bf3c3cf102f92941460651009e62fc57109d80f..9d7b7a5f878a38e92b90c87096c45368a334055a 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/zoneID
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/epsilon
@@ -1,70 +1,57 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2012 |
-| \\ / A nd | Website: www.openfoam.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object zoneID;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- #includeEtc "caseDicts/setConstraintTypes"
-
- overset1
- {
- type overset;
- value uniform 0;
- }
-
- overset2
- {
- type overset;
- value uniform 0;
- }
-
- overset3
- {
- type overset;
- value uniform 0;
- }
-
- hullWall
- {
- type zeroGradient;
- }
-
- propellerWall
- {
- type zeroGradient;
- }
-
- rudderWall
- {
- type zeroGradient;
- }
-
- atmosphere
- {
- type zeroGradient;
- }
-
- defaultFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -3 0 0 0 0];
+
+internalField uniform 6.9e-5;
+
+boundaryField
+{
+ #includeEtc "caseDicts/setConstraintTypes"
+
+ inlet
+ {
+ type fixedValue;
+ value $internalField;
+ }
+
+ "(atmosphere|outlet)"
+ {
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
+ }
+
+ "(HULL*.*)"
+ {
+ type epsilonWallFunction;
+ value $internalField;
+ }
+
+ "(BLADES|HUB_DISK|HUB)"
+ {
+ type epsilonWallFunction;
+ value $internalField;
+ }
+
+ "(overset-1|oversetPatch)"
+ {
+ type overset;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
similarity index 68%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
index 7f41f0c079395e13f3fa793cbd91e69b56a04fff..b9154c3dbfc42cd6e900cf91ea7600a89287760d 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/k
@@ -16,47 +16,40 @@ FoamFile
dimensions [0 2 -2 0 0 0 0];
-internalField uniform 0.01;
+internalField uniform 0.00521;
boundaryField
{
#includeEtc "caseDicts/setConstraintTypes"
- "overset.*"
+ inlet
{
- type overset;
- value uniform 1;
+ type fixedValue;
+ value $internalField;
}
- hullWall
+ "(atmosphere|outlet)"
{
- type kqRWallFunction;
- value uniform 0.01;
+ type inletOutlet;
+ inletValue $internalField;
+ value $internalField;
}
- propellerWall
+ "(HULL*.*)"
{
type kqRWallFunction;
- value uniform 0.01;
+ value $internalField;
}
- rudderWall
+ "(BLADES|HUB_DISK|HUB)"
{
type kqRWallFunction;
- value uniform 0.01;
+ value $internalField;
}
- atmosphere
+ "(overset-1|oversetPatch)"
{
- type inletOutlet;
- inletValue uniform 0.01;
- value uniform 0.01;
- }
-
- defaultFaces
- {
- type kqRWallFunction;
- value uniform 0.01;
+ type overset;
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
similarity index 64%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
index 65fbc07082618deee5ad5f16b76f6fc25a14a475..6b17562b4fa321f17cf08946ae614ee431d08166 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/nut
@@ -9,55 +9,40 @@ FoamFile
{
version 2.0;
format ascii;
- class pointScalarField;
- object motionScale;
+ class volScalarField;
+ object nut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [0 2 -1 0 0 0 0];
-internalField uniform 0;
+internalField uniform 1e-05;
boundaryField
{
- overset1
- {
- type calculated;
- }
+ #includeEtc "caseDicts/setConstraintTypes"
- overset2
+ outlet
{
type calculated;
+ value $internalField;
}
- overset3
+ "(atmosphere|inlet)"
{
type calculated;
+ value $internalField;
}
- hullWall
+ "(BLADES|HUB_DISK|HUB|HUB_COVER|HULL*.*)"
{
- type calculated;
+ type nutkWallFunction;
+ value $internalField;
}
- propellerWall
+ "(overset-1|oversetPatch)"
{
- type calculated;
- }
-
- rudderWall
- {
- type calculated;
- }
-
- atmosphere
- {
- type calculated;
- }
-
- defaultFaces
- {
- type calculated;
+ type overset;
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
similarity index 74%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
index eea2365d8348f1f3c16258ad7abf8e8106f85900..a5b40850d34cb96df0bcc0c6fb0a2e05afdb047d 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/p_rgh
@@ -22,32 +22,33 @@ boundaryField
{
#includeEtc "caseDicts/setConstraintTypes"
- "(hullWall|propellerWall|rudderWall|defaultFaces)"
+ inlet
{
type fixedFluxPressure;
+ value $internalField;
}
- atmosphere
+ "(atmosphere|outlet)"
{
type totalPressure;
- p0 uniform 0;
- U U;
- phi phi;
- rho rho;
- psi none;
- gamma 1;
- value uniform 0;
+ p0 $internalField;
}
- defaultFaces
+ "(HULL*.*)"
{
type fixedFluxPressure;
+ value $internalField;
}
- "overset.*"
+ "(BLADES|HUB_DISK|HUB)"
{
- patchType overset;
- type fixedFluxPressure;
+ type fixedFluxPressure;
+ value $internalField;
+ }
+
+ "(overset-1|oversetPatch)"
+ {
+ type overset;
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
similarity index 83%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
index 99b6b894a1251a1cf3767e258cb1956a504a1195..19eabd4fb588718daa16298d9c539fa77a538105 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/pointDisplacement
@@ -20,13 +20,15 @@ internalField uniform (0 0 0);
boundaryField
{
+ #includeEtc "caseDicts/setConstraintTypes"
+
".*"
{
- type uniformFixedValue;
- uniformValue (0 0 0);
+ type fixedValue;
+ value uniform (0 0 0);
}
- "(hullWall|propellerWall|rudderWall)"
+ "(HULL_DISK|HULL|BLADES|HUB_DISK|HUB)"
{
type calculated;
value uniform (0 0 0);
@@ -38,23 +40,11 @@ boundaryField
type zeroGradient;
}
- "overset.*"
+ overset-1
{
patchType overset;
type zeroGradient;
}
-
- atmosphere
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- defaultFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
}
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID
new file mode 100644
index 0000000000000000000000000000000000000000..4e926ecf9b70b55d555936d7c31bc82a314578a5
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/0.orig/zoneID
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object zoneID;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ #includeEtc "caseDicts/setConstraintTypes"
+
+ ".*"
+ {
+ type zeroGradient;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allclean b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..fb1f3847301c377e02e12439ba58cbf303af3ef9
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..aafec1ca59e5f233ac2641861227c40df20959c5
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun
@@ -0,0 +1,31 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
+#------------------------------------------------------------------------------
+
+./Allrun.pre
+
+restore0Dir
+
+runApplication -s 1 \
+ mergeMeshes . ../overset-1 -overwrite
+
+runApplication -s 2 \
+ mergeMeshes . ../overset-2 -overwrite
+
+runApplication createPatch -overwrite
+
+runApplication -s 1 topoSet
+
+runApplication setFields
+
+runApplication -s 2 \
+ topoSet -dict system/topoSetDict.cHullProp
+
+runApplication decomposePar -force
+
+runParallel $(getApplication)
+
+runParallel redistributePar -reconstruct -overwrite
+
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun.pre
similarity index 82%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun.pre
index f9aa96400d93c788a4829dbd6f6f60b7f91bae7d..e672caaf2abd0a296cbdda818316469a3fc7698c 100755
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/Allrun.pre
@@ -3,10 +3,8 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
-./Allrun.pre
+runApplication blockMesh
-runApplication decomposePar
-
-runParallel $(getApplication)
+runApplication snappyHexMesh -overwrite
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..13cc0a0f484b2ce97eb98ab3338445edb4f44ff0
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/dynamicMeshDict
@@ -0,0 +1,124 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh dynamicOversetFvMesh;
+
+solvers
+{
+ VF
+ {
+ motionSolverLibs (libfvMotionSolvers);
+ motionSolver solidBody;
+ solidBodyMotionFunction drivenLinearMotion;
+ cellSet c0;
+ cOfGdisplacement CofG;
+ }
+
+ boat_propeller
+ {
+ motionSolverLibs (librigidBodyMeshMotion);
+ motionSolver rigidBodyMotion;
+
+ report on;
+ cellSet cHullProp;
+ cOfGdisplacement CofG;
+ bodyIdCofG 1;
+
+ solver
+ {
+ type Newmark;
+ }
+
+ accelerationRelaxation 0.8;
+ accelerationDamping 0.9;
+ nIter 3;
+
+ bodies
+ {
+ hull
+ {
+ type rigidBody;
+ parent root;
+ mass 2787;
+
+ centreOfMass (0.178 0 0.3323);
+ inertia (564 0 0 8535 0 8535);
+ // Transformation tensor and centre of rotation
+ transform (1 0 0 0 1 0 0 0 1) (0.178 0 0.3323);
+ joint
+ {
+ type composite;
+
+ joints
+ (
+ {
+ type Pxyz;
+ }
+ {
+ type Ry;
+ }
+ );
+ }
+ patches
+ (
+ HULL
+ HULL_DISK
+ );
+ innerDistance 100;
+ outerDistance 200;
+ }
+ propeller
+ {
+ type rigidBody;
+ parent hull;
+ centreOfMass (-3.405396 -0.000044 0.129544);
+ mass 0.3;
+ transform (1 0 0 0 1 0 0 0 1) (-3.583 -0.000044 -0.202706);
+ inertia (0.000556833 0 0 0.36905863 0 0.36858374);
+ patches
+ (
+ BLADES
+ HUB
+ HUB_DISK
+ );
+ innerDistance 100;
+ outerDistance 200;
+ joint
+ {
+ type Rx;
+ }
+ }
+ }
+ restraints
+ {
+ force
+ {
+ type externalForce;
+ body hull;
+ location (-3.386 0 0.21);
+ force table
+ (
+ (0 (500 0 0))
+ (10 (2000 0 0))
+ (20 (2000 0 0))
+ );
+ }
+ }
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
similarity index 96%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
index 28b07d0b8775454e4fb6f1314f165492290a396a..290ced5eee6c0ac4cab90686e8532535a2943d56 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/g
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
-value (0 -9.81 0);
+value (0 0 -9.81);
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef
new file mode 100644
index 0000000000000000000000000000000000000000..b0905d870746661233efec1aebf718be9fca23a8
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/hRef
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class uniformDimensionedScalarField;
+ object hRef;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 0 0 0 0 0];
+value 0.4125;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
similarity index 92%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
index 0a3210ea65f816d3e322d3e4ac8e94e5b6d891ad..136c7aeb330f5a54f08d8ddb5913a687d4785322 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/transportProperties
@@ -19,8 +19,8 @@ phases (water air);
water
{
transportModel Newtonian;
- nu 1e-06;
- rho 998.2;
+ nu 1.09e-06;
+ rho 998.8;
}
air
@@ -30,7 +30,7 @@ air
rho 1;
}
-sigma 0;
+sigma 0;
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
similarity index 93%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
index b9b70921b6ed92dbe4366477975a4791a3ef08e9..533c1db4b0b2305107d72c5c135e38f2d28b03f4 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/constant/turbulenceProperties
@@ -16,9 +16,11 @@ FoamFile
simulationType RAS;
+density variable;
+
RAS
{
- RASModel kEpsilon;
+ RASModel realizableKE;
turbulence on;
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..813eba6f25d9e4e5bd5ef42619bcb261a24d8f87
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/blockMeshDict
@@ -0,0 +1,93 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale 1;
+
+vertices
+(
+ ( -7 -3 -1.8 )
+ ( 7 -3 -1.8 )
+ ( 7 3 -1.8 )
+ ( -7 3 -1.8 )
+ ( -7 -3 2.8 )
+ ( 7 -3 2.8 )
+ ( 7 3 2.8 )
+ ( -7 3 2.8 )
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) ( 120 51 39 ) simpleGrading ( 1 1 1 )
+);
+
+edges
+(
+);
+
+boundary
+(
+ outlet
+ {
+ type patch;
+ faces
+ (
+ (0 4 7 3)
+ );
+ }
+ inlet
+ {
+ type patch;
+ faces
+ (
+ (1 2 6 5)
+ );
+ }
+ ymin
+ {
+ type symmetry;
+ faces
+ (
+ (0 1 5 4)
+ );
+ }
+ ymax
+ {
+ type symmetry;
+ faces
+ (
+ (3 7 6 2)
+ );
+ }
+ zmin
+ {
+ type symmetry;
+ faces
+ (
+ (0 3 2 1)
+ );
+ }
+ atmosphere
+ {
+ type patch;
+ faces
+ (
+ (4 5 6 7)
+ );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
similarity index 73%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
index a8d4f21bc3e9254a8292782c73b55bd377d89078..833bb0d946891248c55be000e062e9880995cd16 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/controlDict
@@ -14,58 +14,53 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- overset
- rigidBodyDynamics
- fvMotionSolvers
-);
+libs (overset rigidBodyDynamics);
application overInterDyMFoam;
-startFrom startTime;
+startFrom latestTime;
startTime 0;
stopAt endTime;
-endTime 1.5;
+endTime 4;
-deltaT 0.001;
+deltaT 1e-5;
-writeControl adjustable;
+writeControl adjustableRunTime;
-writeInterval 0.1;
+writeInterval 0.25;
purgeWrite 0;
writeFormat binary;
-writePrecision 10;
+writePrecision 8;
writeCompression off;
timeFormat general;
-timePrecision 6;
+timePrecision 8;
-runTimeModifiable true;
+runTimeModifiable yes;
adjustTimeStep yes;
-maxCo 4.0;
+maxAlphaCo 15;
-maxAlphaCo 5.0;
+maxCo 70;
maxDeltaT 1;
functions
{
- minMax
+ minMax1
{
- type fieldMinMax;
- libs (fieldFunctionObjects);
- fields (U);
+ libs (fieldFunctionObjects);
+ type fieldMinMax;
+ fields (U p);
}
}
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict
new file mode 100644
index 0000000000000000000000000000000000000000..207576934386c825cbb6a8ae4fb1d1caaf6d0e9d
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/createPatchDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object createPatchDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+pointSync false;
+
+patches
+(
+ {
+ name oversetPatch;
+
+ patchInfo
+ {
+ type overset;
+ value uniform 0;
+ }
+
+ constructFrom patches;
+
+ patches (MRF_REGION);
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
similarity index 94%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
index eded3e94ab18e0e6f70d5f84403b2c47e382f246..ce3745e9ec03f726a1cf41fd7177a743825d22fa 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/decomposeParDict
@@ -14,13 +14,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 8;
+numberOfSubdomains 5;
method hierarchical;
coeffs
{
- n (2 2 2);
+ n (5 1 1);
}
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions
new file mode 100644
index 0000000000000000000000000000000000000000..d07cd4502eee5dc9dcf69732e05169930118e227
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvOptions
@@ -0,0 +1,26 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+damp
+{
+ type velocityDampingConstraint;
+ active true;
+ selectionMode all;
+ UMax 14;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
similarity index 62%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
index 715ad329d9bd23f06775fc9e2af61364f8d94dfe..6ac123c5ecc73e0dc59219e33ec09f374074c1cd 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSchemes
@@ -21,25 +21,27 @@ ddtSchemes
gradSchemes
{
- default Gauss linear;
+ default Gauss linear;
+ limitedGrad cellLimited Gauss linear 1;
}
divSchemes
{
- div(rhoPhi,U) Gauss upwind;
- div(U) Gauss linear;
- div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss linear;
- div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+ div(rhoPhi,U) Gauss upwind;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss linear;
+
+ turbulence Gauss linearUpwind limitedGrad;
+ div(phi,k) $turbulence;
+ div(phi,omega) $turbulence;
+ div(phi,epsilon) $turbulence;
- div(phi,k) Gauss upwind;
- div(phi,epsilon) Gauss upwind;
- div(phi,omega) Gauss upwind;
+ div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes
{
- default Gauss linear uncorrected;
+ default Gauss linear corrected;
}
interpolationSchemes
@@ -49,12 +51,27 @@ interpolationSchemes
snGradSchemes
{
- default uncorrected;
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ pcorr ;
+ p ;
+ yPsi ;
}
oversetInterpolation
{
- method inverseDistance;
+ method trackingInverseDistance;
+
+ searchBoxDivisions
+ (
+ (500 500 500)
+ (500 500 500)
+ (500 500 500)
+ );
}
oversetInterpolationSuppressed
@@ -63,8 +80,9 @@ oversetInterpolationSuppressed
surfaceIntegrate(phiHbyA);
}
-fluxRequired
+wallDist
{
+ method Poisson;
}
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
similarity index 60%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
index 16dd7092d97ce0543bcd31e1c3c0610ce879aa9e..f3dc9d4a6ab4663e53007f4e32e58534655e044c 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/fvSolution
@@ -20,103 +20,116 @@ solvers
{
solver PCG;
preconditioner DIC;
- tolerance 1e-06;
+ tolerance 1e-09;
relTol 0;
- maxIter 300;
+ maxIter 200;
}
"alpha.water.*"
{
- nAlphaCorr 3;
+ nAlphaCorr 2;
nAlphaSubCycles 2;
cAlpha 1;
icAlpha 0;
MULESCorr yes;
- nLimiterIter 5;
+ nLimiterIter 10;
alphaApplyPrevCorr no;
solver smoothSolver;
smoother symGaussSeidel;
- tolerance 1e-8;
+ tolerance 1e-12;
relTol 0;
+ minIter 1;
}
- "pcorr.*"
+ p_rgh
{
- solver PCG;
- preconditioner DIC;
+ solver PBiCGStab;
+ preconditioner DILU;
tolerance 1e-9;
- relTol 0;
+ relTol 0.05;
}
- p_rgh
+ p_rghFinal
{
solver PBiCGStab;
preconditioner DILU;
tolerance 1e-9;
- relTol 0.01;
+ relTol 0.0;
}
- Phi
+ pcorr
{
- $p_rgh;
+ $p;
+ solver PBiCGStab;
+ preconditioner DIC;
}
- p_rghFinal
+ pcorrFinal
{
- $p_rgh;
- relTol 0;
+ $pcorr;
+ }
+
+ yPsi
+ {
+ solver PBiCGStab;
+ preconditioner DILU;
+ tolerance 1e-5;
+ relTol 0.0;
+ }
+
+ "(U|h)"
+ {
+ solver smoothSolver;
+ smoother symGaussSeidel;
+ tolerance 1e-6;
+ relTol 0.1;
}
- "(U|k|omega|epsilon).*"
+ "(UFinal|hFinal)"
{
solver smoothSolver;
smoother symGaussSeidel;
- tolerance 1e-08;
+ tolerance 1e-7;
+ relTol 0.0;
+ }
+
+ "(k|omega|epsilon|kFinal|epsilonFinal|omegaFinal)"
+ {
+ solver smoothSolver;
+ smoother symGaussSeidel;
+ tolerance 1e-6;
+ relTol 0.01;
+ }
+
+ "(rho|rhoFinal)"
+ {
+ solver PBiCGStab;
+ preconditioner DILU;
+ tolerance 1e-6;
relTol 0;
}
}
PIMPLE
{
- momentumPredictor no;
nOuterCorrectors 2;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
-
- ddtCorr yes;
- correctPhi no;
- massFluxInterpolation no;
-
- moveMeshOuterCorrectors no;
- turbOnFinalIterOnly yes;
-
+ correctPhi no;
oversetAdjustPhi no;
-}
-
-potentialFlow
-{
- nNonOrthogonalCorrectors 2;
- PhiRefCell 0;
- PhiRefValue 0;
+ ddtCorr false;
+ momentumPredictor false;
}
relaxationFactors
{
- fields
- {
- }
equations
{
- ".*" 1;
+ ".*" 1;
}
}
-cache
-{
- grad(U);
-}
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
similarity index 83%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
index 1abe18b27e45756c8854dd991d82f486a693dbce..990b0fae8c16f13c095248345a339516f20bd2ef 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/setFieldsDict
@@ -17,6 +17,7 @@ FoamFile
defaultFieldValues
(
volScalarFieldValue zoneID 123
+ volScalarFieldValue alpha.water 0
);
regions
@@ -25,7 +26,7 @@ regions
// (does zerogradient on boundaries)
cellToCell
{
- set bgr0;
+ set c0;
fieldValues
(
@@ -35,31 +36,33 @@ regions
cellToCell
{
- set hullBox0;
+ set c1;
fieldValues
(
- volScalarFieldValue zoneID 1
+ volScalarFieldValue zoneID 2
);
}
cellToCell
{
- set propeller0;
+ set c2;
fieldValues
(
- volScalarFieldValue zoneID 2
+ volScalarFieldValue zoneID 1
);
}
- cellToCell
+ // Set cell values
+ // (does zerogradient on boundaries)
+ boxToCell
{
- set rudder0;
+ box (-1000 -1000 -1000) (1000 1000 0.4125);
fieldValues
(
- volScalarFieldValue zoneID 3
+ volScalarFieldValue alpha.water 1
);
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..c7e4bbe682a3c3f7be1439ec1202cc3b31ca506e
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict
@@ -0,0 +1,122 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+castellatedMesh true;
+snap true;
+addLayers false;
+
+geometry
+{
+ BoxRefinement_1
+ {
+ type searchableBox ;
+ min (-3.8 -0.8 -0.2 );
+ max (3.8 0.8 0.75 );
+ }
+};
+
+castellatedMeshControls
+{
+ maxLocalCells 200000000;
+ maxGlobalCells 300000000;
+ minRefinementCells 20;
+ nCellsBetweenLevels 4;
+ maxLoadUnbalance 0.1;
+ allowFreeStandingZoneFaces true;
+ resolveFeatureAngle 30;
+ features
+ (
+ );
+
+ refinementSurfaces
+ {
+ }
+
+ refinementRegions
+ {
+ BoxRefinement_1
+ {
+ mode inside;
+ levels ((1 1));
+ }
+ }
+
+ locationInMesh ( 0 0 0 ) ;
+}
+
+snapControls
+{
+ tolerance 2;
+ implicitFeatureSnap false;
+ explicitFeatureSnap true;
+ multiRegionFeatureSnap true;
+ detectNearSurfacesSnap true;
+ nSmoothPatch 3;
+ nSolveIter 50;
+ nRelaxIter 5;
+ nFeatureSnapIter 10;
+ nSmoothInternal 3;
+ nFaceSplitInterval 5;
+}
+
+addLayersControls
+{
+}
+
+meshQualityControls
+{
+ minVol 1e-13;
+ minTetQuality 1e-16;
+ minArea 1e-13;
+ minTwist 0.05;
+ minDeterminant 1e-06;
+ minFaceWeight 0.02;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 70;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 4;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+
+ relaxed
+ {
+ minVol 1e-30;
+ minTetQuality 1e-30;
+ minArea 1e-30;
+ minTwist 0.001;
+ minDeterminant 1e-06;
+ minFaceWeight 1e-06;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 75;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 8;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+ }
+}
+
+mergeTolerance 1e-08;
+
+debug 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
similarity index 56%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
index 2cd7df3d9f12f77f0d5c66cecd8b783ea2ccb6f5..ffbbec54cc94732ef8db2733c0b53e715d3a6793 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict
@@ -17,21 +17,54 @@ FoamFile
actions
(
{
- name refineSet; // all around hullBox
+ name c0;
type cellSet;
action new;
- source zoneToCell;
- zone hullBox;
+ source regionsToCell;
+ sourceInfo
+ {
+ insidePoints ((-6 0 0.0));
+ }
}
+
+ {
+ name c1;
+ type cellSet;
+ action new;
+ source cellToCell;
+ sourceInfo
+ {
+ set c0;
+ }
+ }
+
+ {
+ name c1;
+ type cellSet;
+ action invert;
+ }
+
+ {
+ name c2;
+ type cellSet;
+ action new;
+ source regionsToCell;
+ sourceInfo
+ {
+ set c1;
+ insidePoints ((-3.4 0.1 0.1));
+ }
+ }
+
{
- name refineSet;
+ name c1;
type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (0.05 -0.2 -0.2)(0.8 0.2 0.2)
- );
+ action delete;
+ source cellToCell;
+ sourceInfo
+ {
+ set c2;
+ }
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
similarity index 78%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
index fbb91c0baca6a505e39e15a7d5c8e29ef491770d..7a350c50ce58294bd9983279ecfae92680d514e8 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp
@@ -17,21 +17,25 @@ FoamFile
actions
(
{
- name refineSet; // all around hullBox
+ name cHullProp;
type cellSet;
action new;
- source zoneToCell;
- zone hullBox;
+ source cellToCell;
+ sourceInfo
+ {
+ set c1;
+ }
}
+
{
- name refineSet;
+ name cHullProp;
type cellSet;
- action subset;
- source boxToCell;
- boxes
- (
- (0 -0.2 -0.2)(0.04 0.2 0.2)
- );
+ action add;
+ source cellToCell;
+ sourceInfo
+ {
+ set c2;
+ }
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allclean
similarity index 89%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allclean
index 8f13a5fccda8692978cfe41dbaac098de6f2e997..d4f5975bc81100693691ef5bc2e8e027d5231e53 100755
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allclean
@@ -5,6 +5,6 @@ cd "${0%/*}" || exit # Run from this directory
cleanCase0
-rm -f constant/cellInterpolationWeight
+rm -rf constant
#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allrun b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..030f5d66d014f655a0d50bf266912fc0c5ff1a86
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/Allrun
@@ -0,0 +1,24 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
+#------------------------------------------------------------------------------
+
+mkdir -p constant/triSurface
+
+cp -f \
+ "$FOAM_TUTORIALS"/resources/geometry/rigidBodyHull/HULL.obj.gz \
+ constant/triSurface/
+
+runApplication blockMesh
+
+runApplication surfaceFeatureExtract
+
+runApplication decomposePar
+
+runParallel snappyHexMesh -overwrite
+
+runParallel redistributePar -reconstruct -constant -overwrite
+
+runApplication renumberMesh -constant -overwrite
+
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
similarity index 59%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
index a54958e693e3e818e528433dc7fc694593ccd412..787ad865b16697b30c04b3e0beaaa8002d3e09dc 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/blockMeshDict
@@ -10,27 +10,46 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object topoSetDict;
+ object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-actions
+scale 1;
+
+vertices
(
+ ( -4.99979 -1.20038 -0.400296 )
+ ( 5 -1.20038 -0.400296 )
+ ( 5 1.20038 -0.400296 )
+ ( -4.99979 1.20038 -0.400296 )
+ ( -4.99979 -1.20038 1.10002 )
+ ( 5 -1.20038 1.10002 )
+ ( 5 1.20038 1.10002 )
+ ( -4.99979 1.20038 1.10002 )
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) ( 85 20 12 ) simpleGrading ( 1 1 1 )
+);
+
+edges
+(
+);
+
+boundary
+(
+ overset-1
{
- name refineSet; // all around bgr
- type cellSet;
- action new;
- source zoneToCell;
- zone background;
- }
- {
- name refineSet;
- type cellSet;
- action subset;
- source boxToCell;
- boxes
+ type overset;
+ faces
(
- (-0.2 -0.2 -0.2)(0.04 0.2 0.2) //hullBox
+ (0 4 7 3)
+ (1 2 6 5)
+ (0 1 5 4)
+ (3 7 6 2)
+ (0 3 2 1)
+ (4 5 6 7)
);
}
);
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..4dcd1c9dbaa969ec099aa0e250d101e9eac56608
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application snappyHexMesh;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1;
+
+deltaT 1;
+
+writeControl timeStep;
+
+writeInterval 1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 8;
+
+writeCompression off;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable no;
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
similarity index 76%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
index 93da9c93048d59c35798186e2f6e809dbb94ae44..ce5165aea0c0cbfc7bfd8511dfce166ec73c9c53 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/decomposeParDict
@@ -10,27 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object refineMeshDict;
+ object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set refineSet;
+numberOfSubdomains 8;
-coordinateSystem global;
+method hierarchical;
-globalCoeffs
+coeffs
{
- tan1 (1 0 0);
- tan2 (0 1 0);
+ n (8 1 1);
}
-directions ( tan1 tan2 );
-
-useHexTopology no;
-
-geometricCut yes;
-
-writeMesh no;
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..15fd4d2a115fdb1dc397ef7df37db02cea4436b6
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSchemes
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+gradSchemes
+{
+}
+
+divSchemes
+{
+}
+
+laplacianSchemes
+{
+}
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..7b5d87613218d4e8370d32d4f7edfc81f00ae2ba
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/fvSolution
@@ -0,0 +1,18 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..c26e82971d9af0e5f301e9ed09a283074df82f86
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict
@@ -0,0 +1,196 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+castellatedMesh true;
+snap true;
+addLayers false;
+
+geometry
+{
+ HULL.obj
+ {
+ type triSurfaceMesh;
+ name HULL ;
+ regions
+ {
+ HULL
+ {
+ name HULL;
+ }
+ HULL_DISK
+ {
+ name HULL_DISK;
+ }
+ }
+ }
+
+ BoxRefinement_1
+ {
+ type searchableBox ;
+ min ( -3.60318 -0.20025 -0.039084 );
+ max ( -3.20311 0.20025 0.395883 );
+ }
+
+ BoxRefinement_3_hub
+ {
+ type searchableBox ;
+ min ( -3.54 -0.12 0.010);
+ max ( -3.34 0.12 0.26);
+ }
+};
+
+castellatedMeshControls
+{
+ maxLocalCells 200000000;
+ maxGlobalCells 300000000;
+ minRefinementCells 20;
+ nCellsBetweenLevels 2;
+ maxLoadUnbalance 0.1;
+ allowFreeStandingZoneFaces true;
+ resolveFeatureAngle 30;
+ features
+ (
+ {
+ file "HULL.eMesh" ;
+ level 0 ;
+ }
+ );
+
+ refinementSurfaces
+ {
+ HULL
+ {
+ level (0 0);
+ regions
+ {
+ HULL
+ {
+ level (2 2);
+ }
+ HULL_DISK
+ {
+ level (2 2);
+ }
+ }
+ }
+ }
+
+ refinementRegions
+ {
+ BoxRefinement_1
+ {
+ mode inside;
+ levels ((0 2));
+ }
+
+ BoxRefinement_3_hub
+ {
+ mode inside;
+ levels ((5 5));
+ }
+ }
+
+ locationInMesh ( 4.3245044 0.88143855 0.86520574 ) ;
+}
+
+snapControls
+{
+ tolerance 2;
+ implicitFeatureSnap false;
+ explicitFeatureSnap true;
+ multiRegionFeatureSnap true;
+ detectNearSurfacesSnap true;
+ nSmoothPatch 3;
+ nSolveIter 50;
+ nRelaxIter 5;
+ nFeatureSnapIter 10;
+ nSmoothInternal 3;
+ nFaceSplitInterval 5;
+}
+
+addLayersControls
+{
+ layers
+ {
+ "(HULL_DISK|HULL)"
+ {
+ nSurfaceLayers 4;
+ }
+ }
+ relativeSizes true ;
+ expansionRatio 1.1 ;
+ firstLayerThickness 0.2 ;
+ featureAngle 85;
+ slipFeatureAngle 30;
+ nGrow 0;
+ nBufferCellsNoExtrude 0;
+ minMedianAxisAngle 90;
+ maxFaceThicknessRatio 0.2;
+ maxThicknessToMedialRatio 0.3;
+ minThickness 1e-06;
+ nLayerIter 50;
+ nRelaxIter 5;
+ nSmoothSurfaceNormals 10;
+ nSmoothNormals 3;
+ nSmoothThickness 10;
+ nRelaxedIter 10;
+ nMedialAxisIter 10;
+}
+
+meshQualityControls
+{
+ minVol 1e-20;
+ minTetQuality 1e-20;
+ minArea 1e-20;
+ minTwist 0.05;
+ minDeterminant 1e-06;
+ minFaceWeight 0.02;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 70;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 4;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+
+ relaxed
+ {
+ minVol 1e-30;
+ minTetQuality 1e-30;
+ minArea 1e-30;
+ minTwist 0.001;
+ minDeterminant 1e-06;
+ minFaceWeight 1e-06;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 75;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 8;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+ }
+}
+
+mergeTolerance 1e-08;
+
+debug 0;
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict
new file mode 100644
index 0000000000000000000000000000000000000000..2858b68b89d16fa079e34b6154f00fa1d19b6a1e
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/surfaceFeatureExtractDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object surfaceFeatureExtractDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+HULL.obj
+{
+ extractionMethod extractFromSurface;
+ writeObj yes;
+
+ extractFromSurfaceCoeffs
+ {
+ includedAngle 150;
+ }
+}
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allclean b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..d4f5975bc81100693691ef5bc2e8e027d5231e53
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+rm -rf constant
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allrun b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..b725e2c95acb69fe375478f7e9dde16b3a3854fc
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/Allrun
@@ -0,0 +1,24 @@
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
+#------------------------------------------------------------------------------
+
+mkdir -p constant/triSurface
+
+cp -f \
+ "$FOAM_TUTORIALS"/resources/geometry/rigidBodyHull/{BLADES,HUB,MRF_REGION}.obj.gz \
+ constant/triSurface/
+
+runApplication blockMesh
+
+runApplication surfaceFeatureExtract
+
+runApplication decomposePar
+
+runParallel snappyHexMesh -overwrite
+
+runParallel redistributePar -reconstruct -constant -overwrite
+
+runApplication renumberMesh -constant -overwrite
+
+#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..cf0a236e708731cf1be622be3ddfcc59fbb5f8ff
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/blockMeshDict
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale 1;
+
+xmin -3.60;
+xmax -3.35;
+ymin -0.2;
+ymax 0.2;
+zmin -0.05;
+zmax 0.3;
+
+vertices
+(
+ ( $xmin $ymin $zmin )
+ ( $xmax $ymin $zmin )
+ ( $xmax $ymax $zmin )
+ ( $xmin $ymax $zmin )
+ ( $xmin $ymin $zmax )
+ ( $xmax $ymin $zmax )
+ ( $xmax $ymax $zmax )
+ ( $xmin $ymax $zmax )
+);
+
+blocks
+(
+ hex (0 1 2 3 4 5 6 7) ( 20 26 20 ) simpleGrading ( 1 1 1 )
+);
+
+edges
+(
+);
+
+boundary
+(
+ XMin
+ {
+ type patch;
+ faces
+ (
+ (0 4 7 3)
+ );
+ }
+ XMax
+ {
+ type patch;
+ faces
+ (
+ (1 2 6 5)
+ );
+ }
+ YMin
+ {
+ type symmetry;
+ faces
+ (
+ (0 1 5 4)
+ );
+ }
+ YMax
+ {
+ type symmetry;
+ faces
+ (
+ (3 7 6 2)
+ );
+ }
+ ZMin
+ {
+ type wall;
+ faces
+ (
+ (0 3 2 1)
+ );
+ }
+ ZMax
+ {
+ type patch;
+ faces
+ (
+ (4 5 6 7)
+ );
+ }
+);
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..4dcd1c9dbaa969ec099aa0e250d101e9eac56608
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application snappyHexMesh;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1;
+
+deltaT 1;
+
+writeControl timeStep;
+
+writeInterval 1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 8;
+
+writeCompression off;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable no;
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
similarity index 76%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
index 11183495cb5dbfed2a7bc7f6c0a394dcaf3d1929..ce5165aea0c0cbfc7bfd8511dfce166ec73c9c53 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/decomposeParDict
@@ -10,27 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object refineMeshDict;
+ object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set refineSet;
+numberOfSubdomains 8;
-coordinateSystem global;
+method hierarchical;
-globalCoeffs
+coeffs
{
- tan1 (1 0 0);
- tan2 (0 1 0);
+ n (8 1 1);
}
-directions ( tan1 tan2 normal);
-
-useHexTopology no;
-
-geometricCut yes;
-
-writeMesh no;
-
// ************************************************************************* //
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..15fd4d2a115fdb1dc397ef7df37db02cea4436b6
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSchemes
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+gradSchemes
+{
+}
+
+divSchemes
+{
+}
+
+laplacianSchemes
+{
+}
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..7b5d87613218d4e8370d32d4f7edfc81f00ae2ba
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/fvSolution
@@ -0,0 +1,18 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..4db8265750924b26316b2a2ef842a9986e3cb007
--- /dev/null
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict
@@ -0,0 +1,205 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: v2012 |
+| \\ / A nd | Website: www.openfoam.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+castellatedMesh true;
+snap true;
+addLayers false;
+
+geometry
+{
+ BLADES.obj
+ {
+ type triSurfaceMesh;
+ name BLADES;
+ }
+
+ HUB.obj
+ {
+ type triSurfaceMesh;
+ name HUB;
+ regions
+ {
+
+ HUB { name HUB; }
+ HUB_DISK { name HUB_DISK; }
+ }
+ }
+
+ MRF_REGION.obj
+ {
+ type triSurfaceMesh;
+ name MRF_REGION;
+ }
+
+ BoxRefinement_3
+ {
+ type searchableBox ;
+ min ( -4 -0.135 0.0085 );
+ max ( -3.3 0.135 0.26 );
+ }
+};
+
+castellatedMeshControls
+{
+ maxLocalCells 200000000;
+ maxGlobalCells 300000000;
+ minRefinementCells 20;
+ nCellsBetweenLevels 2;
+ maxLoadUnbalance 0.1;
+ allowFreeStandingZoneFaces true;
+ resolveFeatureAngle 30;
+ features
+ (
+ {
+ file "HUB.eMesh" ;
+ level 0 ;
+ }
+ {
+ file "BLADES.eMesh" ;
+ level 0 ;
+ }
+ {
+ file "MRF_REGION.eMesh" ;
+ level 0 ;
+ }
+ );
+
+ refinementSurfaces
+ {
+ MRF_REGION
+ {
+ level (2 2);
+ }
+
+ HUB
+ {
+ level (2 2);
+ }
+ BLADES
+ {
+ level (2 4);
+ }
+ }
+
+ refinementRegions
+ {
+ }
+
+ locationInMesh (-3.50 0.0 0.23);
+}
+
+snapControls
+{
+ tolerance 4;
+ implicitFeatureSnap true;
+ explicitFeatureSnap false;
+ multiRegionFeatureSnap true;
+
+ nSmoothPatch 5;
+ nSolveIter 100;
+ nRelaxIter 5;
+ nFeatureSnapIter 15;
+ nSmoothInternal 3;
+}
+
+addLayersControls
+{
+ layers
+ {
+ HUB
+ {
+ nSurfaceLayers 3;
+ firstLayerThickness 0.2;
+ expansionRatio 1.2;
+ }
+ BLADES
+ {
+ nSurfaceLayers 3;
+ firstLayerThickness 0.2;
+ expansionRatio 1.2;
+ }
+ HUB_DISK
+ {
+ nSurfaceLayers 3;
+ firstLayerThickness 0.1;
+ expansionRatio 1.2;
+ }
+ }
+ relativeSizes true ;
+ expansionRatio 1.2 ;
+ firstLayerThickness 0.1 ;
+ featureAngle 85;
+ slipFeatureAngle 30;
+ nGrow 0;
+ nBufferCellsNoExtrude 0;
+ minMedianAxisAngle 90;
+ maxFaceThicknessRatio 0.2;
+ maxThicknessToMedialRatio 0.3;
+ minThickness 1e-06;
+ nLayerIter 50;
+ nRelaxIter 5;
+ nSmoothSurfaceNormals 10;
+ nSmoothNormals 3;
+ nSmoothThickness 10;
+ nRelaxedIter 10;
+ nMedialAxisIter 10;
+}
+
+meshQualityControls
+{
+ minVol 1e-25;
+ minTetQuality 1e-25;
+ minArea 1e-20;
+ minTwist 0.001;
+ minDeterminant 1e-06;
+ minFaceWeight 0.05;
+ minVolRatio 0.001;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 70;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 4;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+ maxNonOrtho 70;
+
+ relaxed
+ {
+ minVol 1e-30;
+ minTetQuality 1e-30;
+ minArea 1e-30;
+ minTwist 0.001;
+ minDeterminant 1e-06;
+ minFaceWeight 1e-06;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ minFlatness 0.5;
+ maxNonOrtho 75;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 8;
+ maxConcave 80;
+ nSmoothScale 4;
+ errorReduction 0.75;
+ }
+}
+
+mergeTolerance 1e-08;
+
+debug 0;
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
similarity index 63%
rename from tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel
rename to tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
index b2295ce6bc9c2c06d7fb8ba3af2b707b5e4c280e..488e9b2c31485cd57a87abd3b070d9a0e9e88ffe 100644
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel
+++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/surfaceFeatureExtractDict
@@ -10,35 +10,43 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object setFieldsDict;
+ object surfaceFeatureExtractDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-defaultFieldValues
-(
- volScalarFieldValue alpha.water 0
-);
+HUB.obj
+{
+ extractionMethod extractFromSurface;
+ writeObj yes;
+
+ extractFromSurfaceCoeffs
+ {
+ includedAngle 150;
+ }
+}
+
+BLADES.obj
+{
+ extractionMethod extractFromSurface;
+ writeObj yes;
-regions
-(
- boxToCell
+ extractFromSurfaceCoeffs
{
- box ( -100 -100 -100 ) ( 100 0.0 100 );
- fieldValues
- (
- volScalarFieldValue alpha.water 1
- );
+ includedAngle 150;
}
+}
+
- boxToFace
+MRF_REGION.obj
+{
+ extractionMethod extractFromSurface;
+ writeObj yes;
+
+ extractFromSurfaceCoeffs
{
- box ( -100 -100 -100 ) ( 100 0.0 100 );
- fieldValues
- (
- volScalarFieldValue alpha.water 1
- );
+ includedAngle 150;
}
-);
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
index 2211518ee324e893303a2a91de35d92b93ef9f3a..b03b4ca9b969ec4f7db17309b6e17ccf9afc4c74 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict
@@ -116,10 +116,8 @@ functions
log true;
timeStart 0;
timeEnd 1000;
- executeControl timeStep;
- executeInterval 1;
- writeControl writeTime;
- writeInterval -1;
+ executeControl onEnd;
+ writeControl onEnd;
}
}
diff --git a/tutorials/resources/geometry/rigidBodyHull/BLADES.obj.gz b/tutorials/resources/geometry/rigidBodyHull/BLADES.obj.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ad4998237a497ea6908cd82f597d0c023377d763
Binary files /dev/null and b/tutorials/resources/geometry/rigidBodyHull/BLADES.obj.gz differ
diff --git a/tutorials/resources/geometry/rigidBodyHull/HUB.obj.gz b/tutorials/resources/geometry/rigidBodyHull/HUB.obj.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0a832965a6972ecd4519690731af07c6f5b2af81
Binary files /dev/null and b/tutorials/resources/geometry/rigidBodyHull/HUB.obj.gz differ
diff --git a/tutorials/resources/geometry/rigidBodyHull/HULL.obj.gz b/tutorials/resources/geometry/rigidBodyHull/HULL.obj.gz
new file mode 100644
index 0000000000000000000000000000000000000000..45cc3f6e1505431770cc017ea082d095bd679967
Binary files /dev/null and b/tutorials/resources/geometry/rigidBodyHull/HULL.obj.gz differ
diff --git a/tutorials/resources/geometry/rigidBodyHull/MRF_REGION.obj.gz b/tutorials/resources/geometry/rigidBodyHull/MRF_REGION.obj.gz
new file mode 100644
index 0000000000000000000000000000000000000000..11be1c26cc347048615b7a9043b6d075ec327dff
Binary files /dev/null and b/tutorials/resources/geometry/rigidBodyHull/MRF_REGION.obj.gz differ
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
index 6651c2562e3a958bfc4a30923967da8d6e2a6e2c..5694a979025ccb3f0784a6e28ebbb0e04d042249 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict
@@ -55,11 +55,10 @@ functions
minMax
{
- type fieldMinMax;
- libs (fieldFunctionObjects);
-
- writeControl writeTime;
+ type fieldMinMax;
+ libs (fieldFunctionObjects);
fields (U);
+ writeControl writeTime;
}
}
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
index 8a5e63946b67c42fbecd735d07cd5d57828cf9b8..5ff86f23b1d0d53d5bb3bb18d7bc7a3d8bc706a0 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso
@@ -2,11 +2,10 @@
sampleIso
{
- type surfaces;
- libs (sampling);
-
- writeControl writeTime;
+ type surfaces;
+ libs (sampling);
surfaceFormat vtk;
+ writeControl writeTime;
fields (U k epsilon nut);
surfaces
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
index ac6817a667335cf37488d4f11f9143bc8228652c..76b64051c99484fea7777d3b5869cc9d7fa9eedd 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines
@@ -10,7 +10,7 @@ _sampler
libs (sampling);
setFormat raw;
interpolationScheme cell;
- writeControl writeTime;
+ writeControl onEnd;
enabled false;
sets
diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
index d2b8986df9e2d0e5eddf9b523436de50fa2166ad..a1756ba5abd40ff33b7c1843a4ebae754bee0ef7 100644
--- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
+++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes
@@ -2,11 +2,10 @@
samplePlanes
{
- type surfaces;
- libs (sampling);
-
- writeControl writeTime;
+ type surfaces;
+ libs (sampling);
surfaceFormat vtk;
+ writeControl writeTime;
fields (U k epsilon nut);
surfaces