mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
GIT: Initial state after latest Foundation merge
This commit is contained in:
Andrew Heather
@ -39,12 +39,6 @@ boundaryField
|
||||
{
|
||||
type totalPressure;
|
||||
p0 uniform 0;
|
||||
U U;
|
||||
phi phi;
|
||||
rho rho;
|
||||
psi none;
|
||||
gamma 1;
|
||||
value $internalField;
|
||||
}
|
||||
|
||||
hull
|
||||
@ -5,13 +5,13 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
# remove surface
|
||||
\rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
|
||||
\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
|
||||
\rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
|
||||
rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
|
||||
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
|
||||
rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
|
||||
|
||||
cleanCase
|
||||
\rm constant/polyMesh/boundary > /dev/null 2>&1
|
||||
\rm -rf 0 > /dev/null 2>&1
|
||||
\rm system/topoSetDict > /dev/null 2>&1
|
||||
rm constant/polyMesh/boundary > /dev/null 2>&1
|
||||
rm -rf 0 > /dev/null 2>&1
|
||||
rm system/topoSetDict > /dev/null 2>&1
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -49,16 +49,14 @@ functions
|
||||
{
|
||||
forces
|
||||
{
|
||||
type forces;
|
||||
functionObjectLibs ( "libforces.so" );
|
||||
patches (hull);
|
||||
rhoInf 998.8;
|
||||
rhoName rho;
|
||||
UName U;
|
||||
log on;
|
||||
outputControl timeStep;
|
||||
outputInterval 1;
|
||||
CofR (2.929541 0 0.2);
|
||||
type forces;
|
||||
libs ("libforces.so");
|
||||
patches (hull);
|
||||
rhoInf 998.8;
|
||||
log on;
|
||||
writeControl timeStep;
|
||||
writeInterval 1;
|
||||
CofR (2.929541 0 0.2);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: plus |
|
||||
|
||||
@ -44,10 +44,6 @@ solvers
|
||||
preconditioner GAMG;
|
||||
|
||||
smoother GaussSeidel;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
nCellsInCoarsestLevel 10;
|
||||
cacheAgglomeration true;
|
||||
|
||||
tolerance 1e-5;
|
||||
relTol 0;
|
||||
@ -62,10 +58,6 @@ solvers
|
||||
solver GAMG;
|
||||
|
||||
smoother DIC;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
nCellsInCoarsestLevel 10;
|
||||
cacheAgglomeration true;
|
||||
|
||||
tolerance 1e-7;
|
||||
relTol 0.01;
|
||||
|
||||
@ -41,13 +41,6 @@ solvers
|
||||
tolerance 1e-5;
|
||||
relTol 0;
|
||||
smoother GaussSeidel;
|
||||
nPreSweeps 0;
|
||||
nPostSweeps 2;
|
||||
nFinestSweeps 2;
|
||||
cacheAgglomeration true;
|
||||
nCellsInCoarsestLevel 10;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
}
|
||||
tolerance 1e-5;
|
||||
relTol 0;
|
||||
@ -61,14 +54,8 @@ solvers
|
||||
relTol 0.01;
|
||||
|
||||
smoother GaussSeidel;
|
||||
nPreSweeps 0;
|
||||
nPostSweeps 2;
|
||||
|
||||
cacheAgglomeration true;
|
||||
|
||||
nCellsInCoarsestLevel 10;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
|
||||
maxIter 50;
|
||||
};
|
||||
|
||||
@ -34,7 +34,7 @@ cloneCase damBreak damBreakFine
|
||||
|
||||
# Modify case
|
||||
setDamBreakFine
|
||||
\cp ../damBreak/0/alpha.water.org 0/alpha.water
|
||||
\cp ../damBreak/0/alpha.water.orig 0/alpha.water
|
||||
# And execute
|
||||
runApplication blockMesh
|
||||
runApplication setFields
|
||||
|
||||
@ -42,12 +42,6 @@ boundaryField
|
||||
{
|
||||
type totalPressure;
|
||||
p0 uniform 0;
|
||||
U U;
|
||||
phi phi;
|
||||
rho rho;
|
||||
psi none;
|
||||
gamma 1;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
defaultFaces
|
||||
|
||||
@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
cleanCase
|
||||
\cp 0/alpha.water.org 0/alpha.water
|
||||
\cp 0/alpha.water.orig 0/alpha.water
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -42,11 +42,7 @@ boundaryField
|
||||
atmosphere
|
||||
{
|
||||
type totalPressure;
|
||||
rho rho;
|
||||
psi none;
|
||||
gamma 1;
|
||||
p0 uniform 0;
|
||||
value uniform 0;
|
||||
}
|
||||
defaultFaces
|
||||
{
|
||||
|
||||
@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
cleanCase
|
||||
\cp 0/alpha.water.org 0/alpha.water
|
||||
\cp 0/alpha.water.orig 0/alpha.water
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
@ -14,32 +14,29 @@ FoamFile
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dictionaryReplacement
|
||||
p_rgh
|
||||
{
|
||||
p_rgh
|
||||
boundaryField
|
||||
{
|
||||
boundaryField
|
||||
porous_half0
|
||||
{
|
||||
porous_half0
|
||||
{
|
||||
type porousBafflePressure;
|
||||
patchType cyclic;
|
||||
D 700;
|
||||
I 500;
|
||||
length 1.05;
|
||||
jump uniform 0;
|
||||
value uniform 0;
|
||||
}
|
||||
porous_half1
|
||||
{
|
||||
type porousBafflePressure;
|
||||
patchType cyclic;
|
||||
D 700;
|
||||
I 500;
|
||||
length 1.05;
|
||||
jump uniform 0;
|
||||
value uniform 0;
|
||||
}
|
||||
type porousBafflePressure;
|
||||
patchType cyclic;
|
||||
D 700;
|
||||
I 500;
|
||||
length 1.05;
|
||||
jump uniform 0;
|
||||
value uniform 0;
|
||||
}
|
||||
porous_half1
|
||||
{
|
||||
type porousBafflePressure;
|
||||
patchType cyclic;
|
||||
D 700;
|
||||
I 500;
|
||||
length 1.05;
|
||||
jump uniform 0;
|
||||
value uniform 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ boundaryField
|
||||
{
|
||||
type inletOutlet;
|
||||
inletValue $internalField;
|
||||
value $internalField ;
|
||||
value $internalField;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -24,12 +24,6 @@ boundaryField
|
||||
{
|
||||
type totalPressure;
|
||||
p0 uniform 0;
|
||||
U U;
|
||||
phi phi;
|
||||
rho rho;
|
||||
psi none;
|
||||
gamma 1;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
".*"
|
||||
|
||||
@ -8,7 +8,7 @@ application=$(getApplication)
|
||||
|
||||
./Allmesh
|
||||
|
||||
cp 0/alpha.water.org 0/alpha.water
|
||||
cp 0/alpha.water.orig 0/alpha.water
|
||||
runApplication setFields
|
||||
|
||||
runApplication $application
|
||||
|
||||
@ -55,14 +55,14 @@ functions
|
||||
{
|
||||
inletFlux
|
||||
{
|
||||
type faceSource;
|
||||
functionObjectLibs ("libfieldFunctionObjects.so");
|
||||
outputControl timeStep;
|
||||
type surfaceFieldValue;
|
||||
libs ("libfieldFunctionObjects.so");
|
||||
writeControl timeStep;
|
||||
log true;
|
||||
// Output field values as well
|
||||
valueOutput false;
|
||||
source patch;
|
||||
sourceName inlet;
|
||||
writeFields false;
|
||||
regionType patch;
|
||||
name inlet;
|
||||
operation sum;
|
||||
|
||||
fields
|
||||
@ -74,13 +74,13 @@ functions
|
||||
outletFlux
|
||||
{
|
||||
$inletFlux;
|
||||
sourceName outlet;
|
||||
name outlet;
|
||||
}
|
||||
|
||||
atmosphereFlux
|
||||
{
|
||||
$inletFlux;
|
||||
sourceName atmosphere;
|
||||
name atmosphere;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ expansionRatio 1.0;
|
||||
linearDirectionCoeffs
|
||||
{
|
||||
axisPt (0 0 0);
|
||||
direction (1 -0.2 -0.02);
|
||||
direction (1 -0.2 -0.03);
|
||||
thickness 40;
|
||||
}
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ divSchemes
|
||||
{
|
||||
default none;
|
||||
|
||||
div(rhoPhi,U) Gauss linearUpwind grad(U);
|
||||
div(rhoPhi,U) Gauss linearUpwind grad(U);
|
||||
div(phi,alpha) Gauss vanLeer;
|
||||
div(phirb,alpha) Gauss linear;
|
||||
|
||||
|
||||
@ -41,13 +41,6 @@ solvers
|
||||
tolerance 1e-5;
|
||||
relTol 0;
|
||||
smoother GaussSeidel;
|
||||
nPreSweeps 0;
|
||||
nPostSweeps 2;
|
||||
nFinestSweeps 2;
|
||||
cacheAgglomeration true;
|
||||
nCellsInCoarsestLevel 10;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
}
|
||||
tolerance 1e-5;
|
||||
relTol 0;
|
||||
@ -61,14 +54,8 @@ solvers
|
||||
relTol 0.01;
|
||||
|
||||
smoother GaussSeidel;
|
||||
nPreSweeps 0;
|
||||
nPostSweeps 2;
|
||||
|
||||
cacheAgglomeration true;
|
||||
|
||||
nCellsInCoarsestLevel 10;
|
||||
agglomerator faceAreaPair;
|
||||
mergeLevels 1;
|
||||
|
||||
maxIter 50;
|
||||
};
|
||||
|
||||
@ -43,7 +43,6 @@ boundaryField
|
||||
atmosphere
|
||||
{
|
||||
type pressureInletOutletVelocity;
|
||||
phi phi;
|
||||
value uniform (0 0 0);
|
||||
}
|
||||
|
||||
@ -25,8 +25,8 @@ boundaryField
|
||||
inlet
|
||||
{
|
||||
type variableHeightFlowRate;
|
||||
lowerBound 0.0;
|
||||
upperBound 0.9;
|
||||
lowerBound 0;
|
||||
upperBound 1;
|
||||
value uniform 0;
|
||||
}
|
||||
|
||||
@ -10,6 +10,5 @@ inletFlowRate 75;
|
||||
pressure 0;
|
||||
turbulentKE 4.14e-03;
|
||||
turbulentEpsilon 4.39e-05;
|
||||
#inputMode merge
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -34,19 +34,13 @@ boundaryField
|
||||
|
||||
lowerWall
|
||||
{
|
||||
type zeroGradient;
|
||||
type fixedFluxPressure;
|
||||
}
|
||||
|
||||
atmosphere
|
||||
{
|
||||
type totalPressure;
|
||||
p0 uniform 0;
|
||||
U U;
|
||||
phi phi;
|
||||
rho none;
|
||||
psi none;
|
||||
gamma 1;
|
||||
value uniform $pressure;
|
||||
}
|
||||
|
||||
defaultFaces
|
||||
@ -7,7 +7,7 @@ restore0Dir
|
||||
|
||||
runApplication blockMesh
|
||||
|
||||
\cp 0/alpha.water.org 0/alpha.water
|
||||
\cp 0/alpha.water.orig 0/alpha.water
|
||||
|
||||
runApplication setFields
|
||||
|
||||
|
||||
Reference in New Issue
Block a user