Commit 8deef93a authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote branch 'OpenCFD/master' into olesenm

parents 5d185831 98f97e78
......@@ -275,7 +275,7 @@ autoPtr<fvMesh> createMesh
mesh.cellZones()
);
}
mesh.addZones(pz, fz, cz);
mesh.addZones(pz, fz, cz);
}
......@@ -399,7 +399,7 @@ void printMeshData(const polyMesh& mesh)
label nProcFaces = 0;
const labelList& nei = patchNeiProcNo[procI];
forAll(patchNeiProcNo[procI], i)
{
Info<< " Number of faces shared with processor "
......
......@@ -107,7 +107,7 @@ case ThirdParty:
breaksw
case Gcc45:
case Gcc45++0x:
set gcc_version=gcc-4.5.0
set gcc_version=gcc-4.5.2
set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.2
set mpc_version=mpc-0.8.1
......@@ -229,7 +229,7 @@ endif
# ~~~~~~~~~~~~~~
set boost_version=boost_1_42_0
set cgal_version=CGAL-3.5.1
set cgal_version=CGAL-3.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
......
......@@ -127,7 +127,7 @@ OpenFOAM | ThirdParty)
mpfr_version=mpfr-2.4.2
;;
Gcc45 | Gcc45++0x)
gcc_version=gcc-4.5.0
gcc_version=gcc-4.5.2
gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.2
mpc_version=mpc-0.8.1
......@@ -248,7 +248,7 @@ fi
# ~~~~~~~~~~~~~~
boost_version=boost_1_42_0
cgal_version=CGAL-3.5.1
cgal_version=CGAL-3.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
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -702,7 +702,7 @@ void Foam::cyclicPolyPatch::transformPosition(pointField& l) const
{
if (!parallel())
{
Foam::transform(forwardT(), l);
l = Foam::transform(forwardT(), l);
}
else if (separated())
{
......
......@@ -33,49 +33,49 @@ inline Foam::label Foam::featureEdgeMesh::convexStart() const
inline Foam::label Foam::featureEdgeMesh::concaveStart() const
{
return concaveStart_;
return concaveStart_;
}
inline Foam::label Foam::featureEdgeMesh::mixedStart() const
{
return mixedStart_;
return mixedStart_;
}
inline Foam::label Foam::featureEdgeMesh::nonFeatureStart() const
{
return nonFeatureStart_;
return nonFeatureStart_;
}
inline Foam::label Foam::featureEdgeMesh::externalStart() const
{
return externalStart_;
return externalStart_;
}
inline Foam::label Foam::featureEdgeMesh::internalStart() const
{
return internalStart_;
return internalStart_;
}
inline Foam::label Foam::featureEdgeMesh::flatStart() const
{
return flatStart_;
return flatStart_;
}
inline Foam::label Foam::featureEdgeMesh::openStart() const
{
return openStart_;
return openStart_;
}
inline Foam::label Foam::featureEdgeMesh::multipleStart() const
{
return multipleStart_;
return multipleStart_;
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -38,7 +38,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
mixedFvPatchScalarField(p, iF),
inletOutletFvPatchScalarField(p, iF),
UName_("U"),
phiName_("phi"),
psiName_("psi"),
......@@ -60,7 +60,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
inletOutletFvPatchScalarField(ptf, p, iF, mapper),
UName_(ptf.UName_),
phiName_(ptf.phiName_),
psiName_(ptf.psiName_),
......@@ -77,7 +77,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const dictionary& dict
)
:
mixedFvPatchScalarField(p, iF),
inletOutletFvPatchScalarField(p, iF),
UName_(dict.lookupOrDefault<word>("U", "U")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
psiName_(dict.lookupOrDefault<word>("psi", "psi")),
......@@ -108,7 +108,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const inletOutletTotalTemperatureFvPatchScalarField& tppsf
)
:
mixedFvPatchScalarField(tppsf),
inletOutletFvPatchScalarField(tppsf),
UName_(tppsf.UName_),
phiName_(tppsf.phiName_),
psiName_(tppsf.psiName_),
......@@ -124,7 +124,7 @@ inletOutletTotalTemperatureFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
mixedFvPatchScalarField(tppsf, iF),
inletOutletFvPatchScalarField(tppsf, iF),
UName_(tppsf.UName_),
phiName_(tppsf.phiName_),
psiName_(tppsf.psiName_),
......@@ -140,7 +140,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::autoMap
const fvPatchFieldMapper& m
)
{
mixedFvPatchScalarField::autoMap(m);
inletOutletFvPatchScalarField::autoMap(m);
T0_.autoMap(m);
}
......@@ -151,7 +151,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::rmap
const labelList& addr
)
{
mixedFvPatchScalarField::rmap(ptf, addr);
inletOutletFvPatchScalarField::rmap(ptf, addr);
const inletOutletTotalTemperatureFvPatchScalarField& tiptf =
refCast<const inletOutletTotalTemperatureFvPatchScalarField>(ptf);
......@@ -182,7 +182,7 @@ void Foam::inletOutletTotalTemperatureFvPatchScalarField::updateCoeffs()
T0_/(1.0 + 0.5*psip*gM1ByG*(1.0 - pos(phip))*magSqr(Up));
this->valueFraction() = 1.0 - pos(phip);
mixedFvPatchScalarField::updateCoeffs();
inletOutletFvPatchScalarField::updateCoeffs();
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -35,7 +35,7 @@ SourceFiles
#ifndef inletOutletTotalTemperatureFvPatchScalarField_H
#define inletOutletTotalTemperatureFvPatchScalarField_H
#include "mixedFvPatchFields.H"
#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -48,7 +48,7 @@ namespace Foam
class inletOutletTotalTemperatureFvPatchScalarField
:
public mixedFvPatchScalarField
public inletOutletFvPatchScalarField
{
// Private data
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -38,10 +38,15 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
fixedValueFvPatchField<scalar>(p, iF),
UName_("U"),
intensity_(0.05)
{}
inletOutletFvPatchScalarField(p, iF),
intensity_(0.0),
UName_("undefined-U"),
phiName_("undefined-phi")
{
this->refValue() = 0.0;
this->refGrad() = 0.0;
this->valueFraction() = 0.0;
}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
turbulentIntensityKineticEnergyInletFvPatchScalarField
......@@ -52,9 +57,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
inletOutletFvPatchScalarField(ptf, p, iF, mapper),
intensity_(ptf.intensity_),
UName_(ptf.UName_),
intensity_(ptf.intensity_)
phiName_(ptf.phiName_)
{}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
......@@ -65,9 +71,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const dictionary& dict
)
:
fixedValueFvPatchField<scalar>(p, iF, dict),
inletOutletFvPatchScalarField(p, iF),
intensity_(readScalar(dict.lookup("intensity"))),
UName_(dict.lookupOrDefault<word>("U", "U")),
intensity_(readScalar(dict.lookup("intensity")))
phiName_(dict.lookupOrDefault<word>("phi", "phi"))
{
if (intensity_ < 0 || intensity_ > 1)
{
......@@ -85,6 +92,12 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalError);
}
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
this->refValue() = 0.0;
this->refGrad() = 0.0;
this->valueFraction() = 0.0;
}
Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
......@@ -93,9 +106,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf
)
:
fixedValueFvPatchField<scalar>(ptf),
inletOutletFvPatchScalarField(ptf),
intensity_(ptf.intensity_),
UName_(ptf.UName_),
intensity_(ptf.intensity_)
phiName_(ptf.phiName_)
{}
......@@ -106,9 +120,10 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
fixedValueFvPatchField<scalar>(ptf, iF),
inletOutletFvPatchScalarField(ptf, iF),
intensity_(ptf.intensity_),
UName_(ptf.UName_),
intensity_(ptf.intensity_)
phiName_(ptf.phiName_)
{}
......@@ -122,12 +137,16 @@ updateCoeffs()
return;
}
const fvPatchField<vector>& Up =
const fvPatchVectorField& Up =
patch().lookupPatchField<volVectorField, vector>(UName_);
operator==(1.5*sqr(intensity_)*magSqr(Up));
const fvsPatchScalarField& phip =
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
this->refValue() = 1.5*sqr(intensity_)*magSqr(Up);
this->valueFraction() = 1.0 - pos(phip);
fixedValueFvPatchField<scalar>::updateCoeffs();
inletOutletFvPatchScalarField::updateCoeffs();
}
......@@ -136,9 +155,10 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
Ostream& os
) const
{
fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);
fvPatchScalarField::write(os);
os.writeKeyword("intensity") << intensity_ << token::END_STATEMENT << nl;
os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -33,7 +33,6 @@ Description
inlet
{
type turbulentIntensityKineticEnergyInlet;
U U; // Name of U field (optional)
intensity 0.05; // 5% turbulence
value uniform 1; // placeholder
}
......@@ -47,7 +46,7 @@ SourceFiles
#ifndef turbulentIntensityKineticEnergyInletFvPatchScalarField_H
#define turbulentIntensityKineticEnergyInletFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
#include "inletOutletFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -60,16 +59,20 @@ namespace Foam
class turbulentIntensityKineticEnergyInletFvPatchScalarField
:
public fixedValueFvPatchScalarField
public inletOutletFvPatchScalarField
{
// Private data
//- Name of belocity field
word UName_;
//- Turbulent intensity as fraction of mean velocity
scalar intensity_;
//- Name of the velocity field
word UName_;
//- Name of the flux field
word phiName_;
public:
//- Runtime type information
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -255,7 +255,7 @@ public:
{
if (++nTrackingRescues_ % size() == 0)
{
Info<< " " << nTrackingRescues_
Pout<< " " << nTrackingRescues_
<< " tracking rescues " << endl;
}
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -30,7 +30,7 @@ Description
cells are potentially in range of each other.
Builds referred interaction list, specifying which cells are
required to provideinteractions across coupled patched (cyclic or
required to provide interactions across coupled patched (cyclic or
processor). Generates referred cells, and refers particles to the
correct processor, applying the appropriate transform.
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -83,7 +83,7 @@ class globalIndexAndTransform
List<vectorTensorTransform> transformPermutations_;
//- Mapping from patch index to which transform it matches (or
// -1 for none) (.first()) and what sign to us for it,
// -1 for none) (.first()) and what sign to use for it,
// i.e. +/- 1 (.second()).
List<Pair<label> > patchTransformSign_;
......
......@@ -124,7 +124,7 @@ void Foam::ConstantRateDevolatilisation<CloudType>::calculate
const scalar A0 = volatileData_[i].second();
// Mass transferred from particle to carrier gas phase
dMassDV = min(dt*A0*massVolatile0, massVolatile);
dMassDV[id] = min(dt*A0*massVolatile0, massVolatile);
}
canCombust = done;
......
......@@ -143,14 +143,14 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Sh
) const
{
volScalarField& h = thermo.h();
const volScalarField cp(thermo.Cp());
const volScalarField Cp(thermo.Cp());
const volScalarField T3(pow3(T_));
return
(
Ru()
- fvm::Sp(4.0*Rp()*T3/cp, h)
- Rp()*T3*(T_ - 4.0*h/cp)
- fvm::Sp(4.0*Rp()*T3/Cp, h)
- Rp()*T3*(T_ - 4.0*h/Cp)
);
}
......@@ -161,14 +161,14 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::radiation::radiationModel::Shs
) const
{
volScalarField& hs = thermo.hs();
const volScalarField cp(thermo.Cp());
const volScalarField Cp(thermo.Cp());
const volScalarField T3(pow3(T_));
return
(
Ru()
- fvm::Sp(4.0*Rp()*T3/cp, hs)
- Rp()*T3*(T_ - 4.0*hs/cp)
- fvm::Sp(4.0*Rp()*T3/Cp, hs)
- Rp()*T3*(T_ - 4.0*hs/Cp)
);
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2006-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2006-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -46,9 +46,15 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
fixedValueFvPatchField<scalar>(p, iF),
mixingLength_(0.001)
{}
inletOutletFvPatchScalarField(p, iF),
mixingLength_(0.0),
phiName_("undefined-phi"),
kName_("undefined-k")
{
this->refValue() = 0.0;
this->refGrad() = 0.0;
this->valueFraction() = 0.0;
}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
......@@ -59,8 +65,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
mixingLength_(ptf.mixingLength_)
inletOutletFvPatchScalarField(ptf, p, iF, mapper),
mixingLength_(ptf.mixingLength_),
phiName_(ptf.phiName_),
kName_(ptf.kName_)
{}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
......@@ -71,9 +79,17 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
const dictionary& dict
)
:
fixedValueFvPatchField<scalar>(p, iF, dict),
mixingLength_(readScalar(dict.lookup("mixingLength")))
{}
inletOutletFvPatchScalarField(p, iF),
mixingLength_(readScalar(dict.lookup("mixingLength"))),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
kName_(dict.lookupOrDefault<word>("k", "k"))
{
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
this->refValue() = 0.0;
this->refGrad() = 0.0;
this->valueFraction() = 0.0;
}
turbulentMixingLengthDissipationRateInletFvPatchScalarField::
turbulentMixingLengthDissipationRateInletFvPatchScalarField
......@@ -81,8 +97,10 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField