Commit 6595429f authored by Sergio Ferraris's avatar Sergio Ferraris
Browse files

Merge branch 'tutorial-boatAndPropeller-rigidBodyHull' into 'develop'

TUT: multiphase: replace boatAndPropeller with rigidBodyHull

See merge request !473
parents 7d425011 6eae29aa
......@@ -57,7 +57,7 @@ functions
type surfaces;
surfaceFormat boundaryData;
writeControl timeStep;
writeInterval 10;
writeInterval 100;
interpolationScheme cell;
fields
(
......
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
#------------------------------------------------------------------------------
(cd steadyState && ./Allclean)
(cd transient && ./Allclean)
#------------------------------------------------------------------------------
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions
#------------------------------------------------------------------------------
(cd steadyState && ./Allrun)
......
#!/bin/sh
cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions
#------------------------------------------------------------------------------
cleanCase0
#------------------------------------------------------------------------------
......@@ -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
......
......@@ -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)
);
}
}
......
......@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs (turbulenceModelSchemes);
libs (turbulenceModelSchemes);
application pimpleFoam;
......@@ -54,6 +54,7 @@ functions
libs (fieldFunctionObjects);
fields (U p);
}
DESField
{
// Mandatory entries
......
......@@ -16,7 +16,7 @@ FoamFile
type sets;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
interpolationScheme cellPoint;
setFormat raw;
......
......@@ -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
......
......@@ -18,7 +18,7 @@ ensightWrite
overwrite true;
writeControl writeTime;
writeControl onEnd;
consecutive false;
}
......
......@@ -11,7 +11,7 @@
// Timing
_visualization
{
writeControl writeTime;
writeControl onEnd;
// enabled true;
......
......@@ -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;
......
......@@ -99,7 +99,7 @@ functions
{
type surfaces;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
interpolationScheme cellPoint;
......
type sets;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
interpolationScheme cellPoint;
......
......@@ -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.
......
......@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
surfaceFormat raw;
fields
(
......
......@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
surfaceFormat raw;
fields
(
......
......@@ -75,7 +75,7 @@ functions
{
type surfaces;
libs (sampling);
writeControl writeTime;
writeControl onEnd;
surfaceFormat raw;
fields
(
......
......@@ -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
);
}
}
......
......@@ -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
);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment