zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/caseDicts/general/fvOptions/porosity/porousZone
View File

@ -18,12 +18,12 @@ porousZone // Change to something more descriptive
{
type explicitPorositySource;
active true;
selectionMode cellZone;
cellZone <cellZoneName>; // Specify the name of the cellZone
explicitPorositySourceCoeffs
{
type DarcyForchheimer;
selectionMode cellZone;
cellZone <cellZoneName>; // Specify the name of the cellZone
DarcyForchheimerCoeffs
{

2
etc/codeTemplates/foamScript Normal file → Executable file
View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License

2
etc/codeTemplates/source/_Template.C
View File

@ -87,7 +87,7 @@ void Foam::CLASSNAME::operator=(const CLASSNAME& rhs)
// Check for assignment to self
if (this == &rhs)
{
FatalErrorIn("Foam::CLASSNAME::operator=(const Foam::CLASSNAME&)")
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}

9
etc/codeTemplates/template/_TemplateTemplate.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -103,11 +103,8 @@ void Foam::CLASSNAME<TemplateArgument>::operator=
// Check for assignment to self
if (this == &rhs)
{
FatalErrorIn
(
"Foam::CLASSNAME<TemplateArgument>::operator="
"(const Foam::CLASSNAME<TemplateArgument>&)"
) << "Attempted assignment to self"
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}
}

2
etc/config/CGAL.csh
View File

@ -30,7 +30,7 @@
##------------------------------------------------------------------------------
set boost_version=boost-system
set cgal_version=CGAL-4.6
set cgal_version=CGAL-4.7
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version

2
etc/config/CGAL.sh
View File

@ -30,7 +30,7 @@
#------------------------------------------------------------------------------
boost_version=boost-system
cgal_version=CGAL-4.6
cgal_version=CGAL-4.7
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version

3
etc/config/paraview.csh
View File

@ -52,7 +52,8 @@ end
#setenv ParaView_VERSION 3.12.0
#setenv ParaView_VERSION 4.0.1
#setenv ParaView_VERSION 4.1.0
setenv ParaView_VERSION 4.3.1
#setenv ParaView_VERSION 4.3.1
setenv ParaView_VERSION 4.4.0
setenv ParaView_MAJOR detect

3
etc/config/paraview.sh
View File

@ -54,7 +54,8 @@ done
#export ParaView_VERSION=3.12.0
#export ParaView_VERSION=4.0.1
#export ParaView_VERSION=4.1.0
export ParaView_VERSION=4.3.1
#export ParaView_VERSION=4.3.1
export ParaView_VERSION=4.4.0
export ParaView_MAJOR=detect

2
etc/config/settings.csh
View File

@ -379,7 +379,7 @@ case SYSTEMOPENMPI:
breaksw
case OPENMPI:
setenv FOAM_MPI openmpi-1.8.5
setenv FOAM_MPI openmpi-1.10.0
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`

2
etc/config/settings.sh
View File

@ -403,7 +403,7 @@ SYSTEMOPENMPI)
;;
OPENMPI)
export FOAM_MPI=openmpi-1.8.5
export FOAM_MPI=openmpi-1.10.0
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`

90
etc/controlDict
View File

@ -913,60 +913,60 @@ DimensionedConstants
{
universal
{
c c [ 0 1 -1 0 0 0 0 ] 2.99792e+08;
G G [ -1 3 -2 0 0 0 0 ] 6.67429e-11;
h h [ 1 2 -1 0 0 0 0 ] 6.62607e-34;
c c [0 1 -1 0 0 0 0] 2.99792e+08;
G G [-1 3 -2 0 0 0 0] 6.67429e-11;
h h [1 2 -1 0 0 0 0] 6.62607e-34;
}
electromagnetic
{
e e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
e e [0 0 1 0 0 1 0] 1.60218e-19;
}
atomic
{
me me [ 1 0 0 0 0 0 0 ] 9.10938e-31;
mp mp [ 1 0 0 0 0 0 0 ] 1.67262e-27;
me me [1 0 0 0 0 0 0] 9.10938e-31;
mp mp [1 0 0 0 0 0 0] 1.67262e-27;
}
physicoChemical
{
mu mu [ 1 0 0 0 0 0 0 ] 1.66054e-27;
k k [ 1 2 -2 -1 0 0 0 ] 1.38065e-23;
mu mu [1 0 0 0 0 0 0] 1.66054e-27;
k k [1 2 -2 -1 0 0 0] 1.38065e-23;
}
standard
{
//- Standard pressure [Pa]
Pstd Pstd [ 1 -1 -2 0 0 0 0 ] 100000;
Pstd Pstd [1 -1 -2 0 0 0 0] 1e5;
//- Standard temperature [degK]
Tstd Tstd [ 0 0 0 1 0 0 0 ] 298.15;
Tstd Tstd [0 0 0 1 0 0 0] 298.15;
}
}
USCSCoeffs
{
universal
{
c c [ 0 1 -1 0 0 0 0 ] 9.83558e+08;
G G [ -1 3 -2 0 0 0 0 ] 1.06909e-09;
h h [ 1 2 -1 0 0 0 0 ] 1.57234e-32;
c c [0 1 -1 0 0 0 0] 9.83558e+08;
G G [-1 3 -2 0 0 0 0] 1.06909e-09;
h h [1 2 -1 0 0 0 0] 1.57234e-32;
}
electromagnetic
{
e e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
e e [0 0 1 0 0 1 0] 1.60218e-19;
}
atomic
{
me me [ 1 0 0 0 0 0 0 ] 2.00825e-30;
mp mp [ 1 0 0 0 0 0 0 ] 3.68746e-27;
me me [1 0 0 0 0 0 0] 2.00825e-30;
mp mp [1 0 0 0 0 0 0] 3.68746e-27;
}
physicoChemical
{
mu mu [ 1 0 0 0 0 0 0 ] 3.66083e-27;
k k [ 1 2 -2 -1 0 0 0 ] 1.82012e-22;
mu mu [1 0 0 0 0 0 0] 3.66083e-27;
k k [1 2 -2 -1 0 0 0] 1.82012e-22;
}
standard
{
//- Standard pressure [lbm/ft^2]
Pstd Pstd [ 1 -1 -2 0 0 0 0 ] 2088.6;
Pstd Pstd [1 -1 -2 0 0 0 0] 2088.6;
//- Standard temperature [degR]
Tstd Tstd [ 0 0 0 1 0 0 0 ] 536.67;
Tstd Tstd [0 0 0 1 0 0 0] 536.67;
}
}
}
@ -979,34 +979,34 @@ DimensionSets
SICoeffs
{
// Basic units
kg kg [ 1 0 0 0 0 0 0 ] 1.0;
m m [ 0 1 0 0 0 0 0 ] 1.0;
s s [ 0 0 1 0 0 0 0 ] 1.0;
K K [ 0 0 0 1 0 0 0 ] 1.0;
mol mol [ 0 0 0 0 1 0 0 ] 1.0;
A A [ 0 0 0 0 0 1 0 ] 1.0;
Cd Cd [ 0 0 0 0 0 0 1 ] 1.0;
kg kg [1 0 0 0 0 0 0] 1.0;
m m [0 1 0 0 0 0 0] 1.0;
s s [0 0 1 0 0 0 0] 1.0;
K K [0 0 0 1 0 0 0] 1.0;
mol mol [0 0 0 0 1 0 0] 1.0;
A A [0 0 0 0 0 1 0] 1.0;
Cd Cd [0 0 0 0 0 0 1] 1.0;
// Derived units
Hz Hz [ s^-1 ] 1.0;
N N [ kg m s^-2 ] 1.0;
Pa Pa [ N m^-2 ] 1.0;
J J [ N m ] 1.0;
W W [ J s^-1 ] 1.0;
Hz Hz [s^-1] 1.0;
N N [kg m s^-2] 1.0;
Pa Pa [N m^-2] 1.0;
J J [N m] 1.0;
W W [J s^-1] 1.0;
// Some non-symbolic ones
area area [m^2] 1.0;
volume volume [m^3] 1.0;
density density [ kg m^-3 ] 1.0;
acceleration acceleration [ m s^-2 ] 1.0;
kinematicPressure kinematicPressure [ Pa density^-1 ] 1.0;
density density [kg m^-3] 1.0;
acceleration acceleration [m s^-2] 1.0;
kinematicPressure kinematicPressure [Pa density^-1] 1.0;
// Scaled units. Only allowed in dimensionedType (dimensionedScalar,
// dimensionedVector etc.) and UniformDimensionedField, not
// in DimensionedField or GeometricField
cm cm [ m ] 1e-2;
mm mm [ m ] 1e-3;
km km [ m ] 1e3;
cm cm [m] 1e-2;
mm mm [m] 1e-3;
km km [m] 1e3;
// Set of units used for printing. Can be any basic or derived
// but not scaled (only supported for dimensionedScalar, etc)
@ -1016,13 +1016,13 @@ DimensionSets
USCSCoeffs
{
// Basic units
lb lb [ 1 0 0 0 0 0 0 ] 1.0;
ft ft [ 0 1 0 0 0 0 0 ] 1.0;
s s [ 0 0 1 0 0 0 0 ] 1.0;
R R [ 0 0 0 1 0 0 0 ] 1.0;
mol mol [ 0 0 0 0 1 0 0 ] 1.0;
A A [ 0 0 0 0 0 1 0 ] 1.0;
Cd Cd [ 0 0 0 0 0 0 1 ] 1.0;
lb lb [1 0 0 0 0 0 0] 1.0;
ft ft [0 1 0 0 0 0 0] 1.0;
s s [0 0 1 0 0 0 0] 1.0;
R R [0 0 0 1 0 0 0] 1.0;
mol mol [0 0 0 0 1 0 0] 1.0;
A A [0 0 0 0 0 1 0] 1.0;
Cd Cd [0 0 0 0 0 0 1] 1.0;
// Set of units used for printing. Can be any basic or derived
// but not scaled (only supported for dimensionedScalar, etc)

0
etc/templates/axisymmetricJet/constant/polyMesh/blockMeshDict → etc/templates/axisymmetricJet/system/blockMeshDict
View File

10
etc/templates/closedVolume/constant/transportProperties
View File

@ -17,18 +17,18 @@ FoamFile
transportModel Newtonian;
// Laminar viscosity
nu nu [0 2 -1 0 0 0 0] 1e-05;
nu [0 2 -1 0 0 0 0] 1e-05;
// Thermal expansion coefficient
beta beta [0 0 0 -1 0 0 0] 3e-03;
beta [0 0 0 -1 0 0 0] 3e-03;
// Reference temperature
TRef TRef [0 0 0 1 0 0 0] 300;
TRef [0 0 0 1 0 0 0] 300;
// Laminar Prandtl number
Pr Pr [0 0 0 0 0 0 0] 0.9;
Pr [0 0 0 0 0 0 0] 0.9;
// Turbulent Prandtl number
Prt Prt [0 0 0 0 0 0 0] 0.7;
Prt [0 0 0 0 0 0 0] 0.7;
// ************************************************************************* //

0
etc/templates/closedVolume/constant/polyMesh/blockMeshDict → etc/templates/closedVolume/system/blockMeshDict
View File

0
etc/templates/closedVolumeRotating/constant/polyMesh/blockMeshDict → etc/templates/closedVolumeRotating/system/blockMeshDict
View File

4
etc/templates/compressibleInflowOutflow/0/epsilon
View File

@ -24,7 +24,7 @@ boundaryField
{
inlet
{
type compressible::turbulentMixingLengthDissipationRateInlet;
type turbulentMixingLengthDissipationRateInlet;
mixingLength 0.05;
value uniform $epsilonInlet;
}
@ -37,7 +37,7 @@ boundaryField
}
wall
{
type compressible::epsilonWallFunction;
type epsilonWallFunction;
value uniform $epsilonInlet;
}

2
etc/templates/compressibleInflowOutflow/0/k
View File

@ -37,7 +37,7 @@ boundaryField
wall
{
type compressible::kqRWallFunction;
type kqRWallFunction;
value uniform $kInlet;
}

2
etc/templates/compressibleInflowOutflow/0/nut
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
dimensions [0 2 -1 0 0 0 0];
internalField uniform 0;

2
etc/templates/compressibleInflowOutflow/0/omega
View File

@ -37,7 +37,7 @@ boundaryField
wall
{
type compressible::omegaWallFunction;
type omegaWallFunction;
value uniform $omegaInlet;
}

23
etc/templates/compressibleInflowOutflow/constant/RASProperties
View File

@ -1,23 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
RASModel kEpsilon;
turbulence on;
printCoeffs on;
// ************************************************************************* //

34
etc/templates/compressibleInflowOutflow/constant/turbulenceProperties
View File

@ -14,6 +14,38 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType RASModel;
simulationType RAS;
RAS
{
RASModel kEpsilon;
turbulence on;
printCoeffs on;
}
LES
{
LESModel SpalartAllmarasDDES;
delta cubeRootVol;
turbulence on;
printCoeffs on;
cubeRootVolCoeffs
{
deltaCoeff 1;
}
smoothCoeffs
{
delta cubeRootVol;
cubeRootVolCoeffs
{
deltaCoeff 1;
}
maxDeltaRatio 1.1;
}
}
// ************************************************************************* //

0
etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict → etc/templates/compressibleInflowOutflow/system/blockMeshDict
View File

0
etc/templates/compressibleInflowOutflow/constant/polyMesh/blockMeshDict.extPatches → etc/templates/compressibleInflowOutflow/system/blockMeshDict.extPatches
View File

2
etc/templates/compressibleInflowOutflow/system/fvSchemes
View File

@ -49,7 +49,7 @@ divSchemes
div(phid,p) bounded Gauss upwind;
div((phi|interpolate(rho)),p) bounded Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
}
laplacianSchemes

0
etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict → etc/templates/inflowOutflow/system/blockMeshDict
View File

0
etc/templates/inflowOutflow/constant/polyMesh/blockMeshDict.extPatches → etc/templates/inflowOutflow/system/blockMeshDict.extPatches
View File

0
etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict → etc/templates/inflowOutflowRotating/system/blockMeshDict
View File

0
etc/templates/inflowOutflowRotating/constant/polyMesh/blockMeshDict.extPatches → etc/templates/inflowOutflowRotating/system/blockMeshDict.extPatches
View File