Commit 0aa8d3bd authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

parents cdb08178 6d2037c8
......@@ -17,28 +17,33 @@ FoamFile
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
internalField uniform (1 0 0);
boundaryField
{
inlet
{
type fixedValue;
value uniform (5 0 0);
value uniform (1 0 0);
}
outlet
{
type zeroGradient;
}
sides
{
type zeroGradient;
type symmetryPlane;
}
atmosphere
{
type symmetryPlane;
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
wigley_solid
hull_wall
{
type fixedValue;
value uniform (0 0 0);
......
......@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object alpha;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -22,7 +23,7 @@ boundaryField
{
inlet
{
type fixedValue;
type calculated;
value uniform 0;
}
......@@ -35,20 +36,19 @@ boundaryField
sides
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
type symmetryPlane;
}
atmosphere
{
type symmetryPlane;
type inletOutlet;
inletValue uniform 0;
value uniform 0;
}
wigley_solid
hull_wall
{
type fixedValue;
value uniform 0;
type zeroGradient;
}
}
......
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -2 0 0 0 0];
internalField uniform 0.00015;
boundaryField
{
inlet
{
type fixedValue;
value uniform 0.00015;
}
outlet
{
type zeroGradient;
}
sides
{
type symmetryPlane;
}
atmosphere
{
type inletOutlet;
inletValue uniform 0.00015;
value uniform 0.00015;
}
hull_wall
{
type kqRWallFunction;
value uniform 0.00015;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object nut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
internalField uniform 5e-07;
boundaryField
{
inlet
{
type fixedValue;
value uniform 5e-07;
}
outlet
{
type zeroGradient;
}
sides
{
type symmetryPlane;
}
atmosphere
{
type zeroGradient;
}
hull_wall
{
type nutkWallFunction;
value uniform 0;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 -1 0 0 0 0];
internalField uniform 2;
boundaryField
{
inlet
{
type fixedValue;
value uniform 2;
}
outlet
{
type inletOutlet;
inletValue uniform 2;
value uniform 2;
}
outlet
{
type zeroGradient;
}
sides
{
type symmetryPlane;
}
atmosphere
{
type inletOutlet;
inletValue uniform 2;
value uniform 2;
}
hull_wall
{
type omegaWallFunction;
value uniform 2;
}
}
// ************************************************************************* //
......@@ -28,22 +28,27 @@ boundaryField
outlet
{
type fixedValue;
value uniform 0;
type zeroGradient;
}
sides
{
type buoyantPressure;
value uniform 0;
type symmetryPlane;
}
atmosphere
{
type symmetryPlane;
type totalPressure;
p0 uniform 0;
U U;
phi phi;
rho rho;
psi none;
gamma 1;
value uniform 0;
}
wigley_solid
hull_wall
{
type buoyantPressure;
value uniform 0;
......
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
runApplication snappyHexMesh -overwrite
runApplication transformPoints -scale '(2 1 1)'
transformPoints -scale '(2 1 1)'
cp 0/alpha1.org 0/alpha1
runApplication setFields
runApplication LTSInterFoam
runApplication `getApplication`
# ----------------------------------------------------------------- end-of-file
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
RASModel kOmegaSST;
turbulence on;
printCoeffs on;
// ************************************************************************* //
......@@ -16,7 +16,6 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
value ( 0 -9.81 0 );
value (0 0 -9.81);
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
......@@ -18,19 +18,19 @@ convertToMeters 1;
vertices
(
( -10 -23 -17)
( 30 -23 -17)
( 30 2 -17)
( -10 2 -17)
( -10 -23 23)
( 30 -23 23)
( 30 2 23)
( -10 2 23)
(-0.75 -0.75 -0.5)
( 1.25 -0.75 -0.5)
( 1.25 0.75 -0.5)
(-0.75 0.75 -0.5)
(-0.75 -0.75 0.0399)
( 1.25 -0.75 0.0399)
( 1.25 0.75 0.0399)
(-0.75 0.75 0.0399)
);
blocks
(
hex (0 1 2 3 4 5 6 7) (35 20 30) simpleGrading (1 1 1)
hex (0 1 2 3 4 5 6 7) (40 30 10) simpleGrading (1 1 1)
);
edges
......@@ -49,16 +49,16 @@ patches
(2 6 5 1)
)
symmetryPlane atmosphere
patch atmosphere
(
(3 7 6 2)
(4 5 6 7)
)
patch sides
symmetryPlane sides
(
(1 5 4 0)
(3 7 6 2)
(0 3 2 1)
(4 5 6 7)
)
);
......
......@@ -18,48 +18,18 @@ FoamFile
phase1
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
rho rho [ 1 -3 0 0 0 0 0 ] 1000;
CrossPowerLawCoeffs
{
nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
m m [ 0 0 1 0 0 0 0 ] 1;
n n [ 0 0 0 0 0 0 0 ] 0;
}
BirdCarreauCoeffs
{
nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
k k [ 0 0 1 0 0 0 0 ] 99.6;
n n [ 0 0 0 0 0 0 0 ] 0.1003;
}
}
phase2
{
transportModel Newtonian;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
rho rho [ 1 -3 0 0 0 0 0 ] 1;
CrossPowerLawCoeffs
{
nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
m m [ 0 0 1 0 0 0 0 ] 1;
n n [ 0 0 0 0 0 0 0 ] 0;
}
BirdCarreauCoeffs
{
nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
k k [ 0 0 1 0 0 0 0 ] 99.6;
n n [ 0 0 0 0 0 0 0 ] 0.1003;
}
}
sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
// ************************************************************************* //
......@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
simulationType RASModel;
// ************************************************************************* //
......@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
application interFoam;
application LTSInterFoam;
startFrom startTime;
......@@ -23,13 +23,13 @@ startTime 0;
stopAt endTime;
endTime 500;
endTime 3000;
deltaT 1;
writeControl timeStep;
writeInterval 1;
writeInterval 100;
purgeWrite 0;
......@@ -37,7 +37,7 @@ writeFormat ascii;
writePrecision 6;
writeCompression uncompressed;
writeCompression compressed;
timeFormat general;
......@@ -45,12 +45,5 @@ timePrecision 6;
runTimeModifiable yes;
//adjustTimeStep yes;
//
//maxCo 0.5;
//maxAlphaCo 0.5;
//
//maxDeltaT 1;
// ************************************************************************* //
......@@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method simple;
method simple; // Seriously don't actually use this method
simpleCoeffs
{
......@@ -25,18 +25,6 @@ simpleCoeffs
delta 0.001;
}
hierarchicalCoeffs
{
n ( 1 1 1 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
......
......@@ -17,7 +17,7 @@ FoamFile
ddtSchemes
{
default Euler;
default localEuler rDeltaT;
}
gradSchemes
......@@ -27,9 +27,11 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss limitedLinearV 1;
div(rho*phi,U) Gauss linearUpwind Gauss linear;
div(phi,alpha) Gauss vanLeer;
div(phirb,alpha) Gauss interfaceCompression;
div(phi,k) Gauss upwind;
div(phi,omega) Gauss upwind;
}
laplacianSchemes
......
......@@ -20,44 +20,80 @@ solvers
pcorr
{
solver PCG;
preconditioner DIC;
tolerance 1e-10;
preconditioner
{
preconditioner GAMG;
smoother DICGaussSeidel;
agglomerator faceAreaPair;
mergeLevels 1;
nCellsInCoarsestLevel 10;
cacheAgglomeration true;
tolerance 1e-5;
relTol 0;
};
tolerance 1e-5;
relTol 0;
}
};
p_rgh
{
solver PCG;
preconditioner DIC;
tolerance 1e-07;
relTol 0.05;
}
solver GAMG;
smoother GaussSeidel;
agglomerator faceAreaPair;
mergeLevels 1;
nCellsInCoarsestLevel 10;
cacheAgglomeration true;
tolerance 1e-6;
relTol 0.01;
};
p_rghFinal
{
$p_rgh;
tolerance 1e-07;
tolerance 1e-6;
relTol 0;
}
U
"(U|k|omega)"
{
solver PBiCG;
preconditioner DILU;