songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy 2013-03-12 13:16:04 +00:00
commit dd9bd4f684
28 changed files with 124 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/cavitatingFoam/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \

2
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \

3
applications/solvers/multiphase/compressibleInterFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \
-ItwoPhaseMixtureThermo \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude
@ -10,6 +10,7 @@ EXE_LIBS = \
-ltwoPhaseMixtureThermo \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lcompressibleTurbulenceModel \

3
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
View File

@ -2,7 +2,7 @@ EXE_INC = \
-I.. \
-I../twoPhaseMixtureThermo \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -14,6 +14,7 @@ EXE_LIBS = \
-ltwoPhaseMixtureThermo \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lcompressibleTurbulenceModel \

4
applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options
View File

@ -1,10 +1,10 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseProperties \
-ltwoPhaseMixture \
-lfiniteVolume

3
applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -12,6 +12,7 @@ EXE_INC = \
EXE_LIBS = \
-linterfaceProperties \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \

3
applications/solvers/multiphase/interFoam/MRFInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -11,6 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \

3
applications/solvers/multiphase/interFoam/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \

3
applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -13,6 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \

3
applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-IincompressibleThreePhaseMixture \
-IthreePhaseInterfaceProperties \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -13,6 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \

3
applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -11,6 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \

3
applications/solvers/multiphase/interPhaseChangeFoam/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \

4
applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
-I../interFoam \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -8,7 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-ltwoPhaseProperties \
-ltwoPhaseMixture \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \

50
src/OpenFOAM/db/dictionary/entry/entryIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,6 +30,8 @@ License
#include "inputModeEntry.H"
#include "stringOps.H"
#include "IOstreams.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
@ -114,6 +116,9 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
&& keyword[0] == '$'
) // ... Substitution entry
{
token nextToken(is);
is.putBack(nextToken);
if (keyword.size() > 2 && keyword[1] == token::BEGIN_BLOCK)
{
// Recursive substitution mode. Replace between {} with
@ -125,7 +130,48 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
stringOps::inplaceExpand(s, parentDict, true, false);
keyword.std::string::replace(1, keyword.size()-1, s);
}
parentDict.substituteScopedKeyword(keyword);
if (nextToken == token::BEGIN_BLOCK)
{
word varName = keyword(1, keyword.size()-1);
// lookup the variable name in the given dictionary
const entry* ePtr = parentDict.lookupScopedEntryPtr
(
varName,
true,
true
);
if (ePtr)
{
// Read as primitiveEntry
const word newKeyword(ePtr->stream());
return parentDict.add
(
new dictionaryEntry(newKeyword, parentDict, is),
false
);
}
else
{
FatalIOErrorIn
(
"entry::New(const dictionary& parentDict, Istream&)",
is
)
<< "Attempt to use undefined variable " << varName
<< " as keyword"
<< exit(FatalIOError);
return false;
}
}
else
{
parentDict.substituteScopedKeyword(keyword);
}
return true;
}
else if

12
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -171,7 +171,8 @@ Foam::fvMesh::fvMesh(const IOobject& io)
time().timeName(),
*this,
IOobject::MUST_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
),
*this
);
@ -191,7 +192,8 @@ Foam::fvMesh::fvMesh(const IOobject& io)
time().timeName(),
*this,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
false
),
*this
);
@ -564,7 +566,8 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
time().timeName(),
*this,
IOobject::NO_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
),
V()
);
@ -585,7 +588,8 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
this->time().timeName(),
*this,
IOobject::NO_READ,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
false
),
*this,
dimVolume/dimTime

6
src/finiteVolume/fvMesh/fvMeshGeometry.C
View File

@ -208,7 +208,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
time().timeName(),
*this,
IOobject::NO_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
),
*this,
dimVolume,
@ -258,7 +259,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
time().timeName(),
*this,
IOobject::NO_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
),
V0()
);

20
src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
View File

@ -148,7 +148,10 @@ void Foam::surfaceInterpolation::makeWeights() const
(
"weights",
mesh_.pointsInstance(),
mesh_
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
),
mesh_,
dimless
@ -217,7 +220,10 @@ void Foam::surfaceInterpolation::makeDeltaCoeffs() const
(
"deltaCoeffs",
mesh_.pointsInstance(),
mesh_
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
),
mesh_,
dimless/dimLength
@ -262,7 +268,10 @@ void Foam::surfaceInterpolation::makeNonOrthDeltaCoeffs() const
(
"nonOrthDeltaCoeffs",
mesh_.pointsInstance(),
mesh_
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
),
mesh_,
dimless/dimLength
@ -320,7 +329,10 @@ void Foam::surfaceInterpolation::makeNonOrthCorrectionVectors() const
(
"nonOrthCorrectionVectors",
mesh_.pointsInstance(),
mesh_
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
),
mesh_,
dimless

12
src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.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-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -139,7 +139,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
const boundBox& bb = mesh_.bounds();
pointField points(bb.points());
label minPointI = -1;
//label minPointI = -1;
label maxPointI = -1;
forAll(points, pointI)
{
@ -152,7 +152,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
else if (c < minComp)
{
minComp = c;
minPointI = pointI;
//minPointI = pointI;
}
}
@ -179,7 +179,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
PackedBoolList selected(mesh_.nCells());
label nSelected = -1;
scalar selectedVol = 0.0;
scalar selectedComp = 0.0;
//scalar selectedComp = 0.0;
scalar low = minComp;
@ -228,7 +228,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
if (selectedVol < vol_)
{
selectedComp = high;
//selectedComp = high;
}
else
{
@ -237,7 +237,7 @@ void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
if (selectedVol < vol_)
{
selectedComp = low;
//selectedComp = low;
}
else
{

1
src/transportModels/Allwmake
View File

@ -3,6 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
makeType=${1:-libso}
set -x
wmake $makeType twoPhaseMixture
wmake $makeType interfaceProperties
wmake $makeType twoPhaseProperties
wmake $makeType incompressible

4
src/transportModels/incompressible/Make/options
View File

@ -1,8 +1,8 @@
EXE_INC = \
-I.. \
-I../twoPhaseProperties/lnInclude \
-I../twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-ltwoPhaseProperties \
-ltwoPhaseMixture \
-lfiniteVolume

5
src/transportModels/interfaceProperties/Make/options
View File

@ -1,5 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = -lfiniteVolume
LIB_LIBS = \
-ltwoPhaseMixture \
-lfiniteVolume

3
src/transportModels/twoPhaseMixture/Make/files Normal file
View File

@ -0,0 +1,3 @@
twoPhaseMixture/twoPhaseMixture.C
LIB = $(FOAM_LIBBIN)/libtwoPhaseMixture

5
src/transportModels/twoPhaseMixture/Make/options Normal file
View File

@ -0,0 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lfiniteVolume

0
src/transportModels/twoPhaseProperties/twoPhaseMixture/twoPhaseMixture.C → src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
View File

0
src/transportModels/twoPhaseProperties/twoPhaseMixture/twoPhaseMixture.H → src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
View File

2
src/transportModels/twoPhaseProperties/Make/files
View File

@ -1,5 +1,3 @@
twoPhaseMixture/twoPhaseMixture.C
alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C

2
src/transportModels/twoPhaseProperties/Make/options
View File

@ -1,7 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-lfiniteVolume

2
tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes
View File

@ -38,7 +38,7 @@ divSchemes
"div\(phid.,p\)" Gauss upwind;
"div\(alphaPhi.,(h|e).\)" Gauss limitedLinear 1;
"div\(alphaPhi.,K.\)" Gauss limitedLinear 1;
"div\(alphaPhi.,(K.|p)\)" Gauss limitedLinear 1;
div(alphaPhi2,k) Gauss limitedLinear 1;
div(alphaPhi2,epsilon) Gauss limitedLinear 1;