Commit 75ea7618 authored by Henry Weller's avatar Henry Weller
Browse files

GeometricField::GeometricBoundaryField -> GeometricField::Boundary

When the GeometricBoundaryField template class was originally written it
was a separate class in the Foam namespace rather than a sub-class of
GeometricField as it is now.  Without loss of clarity and simplifying
code which access the boundary field of GeometricFields it is better
that GeometricBoundaryField be renamed Boundary for consistency with the
new naming convention for the type of the dimensioned internal field:
Internal, see commit a25a449c

This is a very simple text substitution change which can be applied to
any code which compiles with the OpenFOAM-dev libraries.
parent a25a449c
......@@ -119,7 +119,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
}
}
volScalarField::GeometricBoundaryField& xieqBf = xieq.boundaryFieldRef();
volScalarField::Boundary& xieqBf = xieq.boundaryFieldRef();
forAll(xieq.boundaryField(), patchi)
{
......
......@@ -266,7 +266,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi);
}
volScalarField::GeometricBoundaryField& Su0Bf = Su0.boundaryFieldRef();
volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
forAll(Su0Bf, patchi)
{
......@@ -315,7 +315,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
Su0[celli] = Su0pTphi(p[celli], Tu[celli], phi[celli]);
}
volScalarField::GeometricBoundaryField& Su0Bf = Su0.boundaryFieldRef();
volScalarField::Boundary& Su0Bf = Su0.boundaryFieldRef();
forAll(Su0Bf, patchi)
{
......@@ -369,7 +369,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
ma[celli] = Ma(phi[celli]);
}
volScalarField::GeometricBoundaryField& maBf = ma.boundaryFieldRef();
volScalarField::Boundary& maBf = ma.boundaryFieldRef();
forAll(maBf, patchi)
{
......
......@@ -815,10 +815,10 @@ void Foam::multiphaseMixtureThermo::correctContactAngle
(
const phaseModel& alpha1,
const phaseModel& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const
{
const volScalarField::GeometricBoundaryField& gbf
const volScalarField::Boundary& gbf
= alpha1.boundaryField();
const fvBoundaryMesh& boundary = mesh_.boundary();
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -170,7 +170,7 @@ private:
(
const phaseModel& alpha1,
const phaseModel& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const;
tmp<volScalarField> K
......
......@@ -54,7 +54,7 @@
phic += (mixture.cAlpha()*icAlpha)*fvc::interpolate(mag(U));
}
surfaceScalarField::GeometricBoundaryField& phicBf =
surfaceScalarField::Boundary& phicBf =
phic.boundaryFieldRef();
// Do not compress interface at non-coupled boundary faces
......
......@@ -41,16 +41,16 @@ const Foam::scalar Foam::threePhaseInterfaceProperties::convertToRad =
void Foam::threePhaseInterfaceProperties::correctContactAngle
(
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const
{
const volScalarField::GeometricBoundaryField& alpha1 =
const volScalarField::Boundary& alpha1 =
mixture_.alpha1().boundaryField();
const volScalarField::GeometricBoundaryField& alpha2 =
const volScalarField::Boundary& alpha2 =
mixture_.alpha2().boundaryField();
const volScalarField::GeometricBoundaryField& alpha3 =
const volScalarField::Boundary& alpha3 =
mixture_.alpha3().boundaryField();
const volVectorField::GeometricBoundaryField& U =
const volVectorField::Boundary& U =
mixture_.U().boundaryField();
const fvMesh& mesh = mixture_.U().mesh();
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -82,7 +82,7 @@ class threePhaseInterfaceProperties
// Calculated from the component of U parallel to the wall
void correctContactAngle
(
surfaceVectorField::GeometricBoundaryField& nHat
surfaceVectorField::Boundary& nHat
) const;
//- Re-calculate the interface curvature
......
......@@ -124,7 +124,7 @@ void Foam::multiphaseSystem::solveAlphas()
);
}
surfaceScalarField::GeometricBoundaryField& alphaPhiCorrBf =
surfaceScalarField::Boundary& alphaPhiCorrBf =
alphaPhiCorr.boundaryFieldRef();
// Ensure that the flux at inflow BCs is preserved
......@@ -266,10 +266,10 @@ void Foam::multiphaseSystem::correctContactAngle
(
const phaseModel& phase1,
const phaseModel& phase2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const
{
const volScalarField::GeometricBoundaryField& gbf
const volScalarField::Boundary& gbf
= phase1.boundaryField();
const fvBoundaryMesh& boundary = mesh_.boundary();
......@@ -668,7 +668,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
}
}
volVectorField::GeometricBoundaryField& SvmBf =
volVectorField::Boundary& SvmBf =
tSvm.ref().boundaryFieldRef();
// Remove virtual mass at fixed-flux boundaries
......@@ -718,7 +718,7 @@ Foam::multiphaseSystem::dragCoeffs() const
)
).ptr();
volScalarField::GeometricBoundaryField& Kbf = Kptr->boundaryFieldRef();
volScalarField::Boundary& Kbf = Kptr->boundaryFieldRef();
// Remove drag at fixed-flux boundaries
forAll(dm.phase1().phi().boundaryField(), patchi)
......
......@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -213,7 +213,7 @@ private:
(
const phaseModel& alpha1,
const phaseModel& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const;
tmp<volScalarField> K
......
......@@ -187,7 +187,7 @@
// Update the fixedFluxPressure BCs to ensure flux consistency
{
surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
surfaceScalarField::Boundary phib(phi.boundaryField());
phib = 0;
phasei = 0;
forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
......
......@@ -415,10 +415,10 @@ void Foam::multiphaseMixture::correctContactAngle
(
const phase& alpha1,
const phase& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const
{
const volScalarField::GeometricBoundaryField& gbf
const volScalarField::Boundary& gbf
= alpha1.boundaryField();
const fvBoundaryMesh& boundary = mesh_.boundary();
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -180,7 +180,7 @@ private:
(
const phase& alpha1,
const phase& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const;
tmp<volScalarField> K(const phase& alpha1, const phase& alpha2) const;
......
......@@ -118,7 +118,7 @@ Foam::saturationModels::polynomial::Tsat
Tsat[celli] = C_.value(p[celli]);
}
volScalarField::GeometricBoundaryField& TsatBf = Tsat.boundaryFieldRef();
volScalarField::Boundary& TsatBf = Tsat.boundaryFieldRef();
forAll(Tsat.boundaryField(), patchi)
{
......
......@@ -50,7 +50,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModel::zeroGradWalls
volVectorField& Fi = tFi.ref();
const fvPatchList& patches = Fi.mesh().boundary();
volVectorField::GeometricBoundaryField& FiBf = Fi.boundaryFieldRef();
volVectorField::Boundary& FiBf = Fi.boundaryFieldRef();
forAll(patches, patchi)
{
......
......@@ -36,7 +36,7 @@ void Foam::BlendedInterfacialModel<ModelType>::correctFixedFluxBCs
GeometricField& field
) const
{
typename GeometricField::GeometricBoundaryField& fieldBf =
typename GeometricField::Boundary& fieldBf =
field.boundaryFieldRef();
forAll(phase1_.phi()().boundaryField(), patchi)
......
......@@ -134,7 +134,7 @@ void Foam::multiphaseSystem::solveAlphas()
);
}
surfaceScalarField::GeometricBoundaryField& alphaPhiCorrBf =
surfaceScalarField::Boundary& alphaPhiCorrBf =
alphaPhiCorr.boundaryFieldRef();
// Ensure that the flux at inflow BCs is preserved
......@@ -369,10 +369,10 @@ void Foam::multiphaseSystem::correctContactAngle
(
const phaseModel& phase1,
const phaseModel& phase2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const
{
const volScalarField::GeometricBoundaryField& gbf
const volScalarField::Boundary& gbf
= phase1.boundaryField();
const fvBoundaryMesh& boundary = mesh_.boundary();
......
......@@ -91,7 +91,7 @@ class multiphaseSystem
(
const phaseModel& alpha1,
const phaseModel& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const;
tmp<volScalarField> K
......
......@@ -182,7 +182,7 @@ while (pimple.correct())
);
surfaceScalarField phiCorrCoeff(pos(alphafBar - 0.99));
surfaceScalarField::GeometricBoundaryField& phiCorrCoeffBf =
surfaceScalarField::Boundary& phiCorrCoeffBf =
phiCorrCoeff.boundaryFieldRef();
forAll(mesh.boundary(), patchi)
......@@ -274,7 +274,7 @@ while (pimple.correct())
// Update the fixedFluxPressure BCs to ensure flux consistency
{
surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
surfaceScalarField::Boundary phib(phi.boundaryField());
phib = 0;
forAll(phases, phasei)
{
......
......@@ -150,10 +150,10 @@ while (pimple.correct())
surfaceScalarField phiCorrCoeff2(pos(0.01 - alphaf1Bar));
{
surfaceScalarField::GeometricBoundaryField& phiCorrCoeff1Bf =
surfaceScalarField::Boundary& phiCorrCoeff1Bf =
phiCorrCoeff1.boundaryFieldRef();
surfaceScalarField::GeometricBoundaryField& phiCorrCoeff2Bf =
surfaceScalarField::Boundary& phiCorrCoeff2Bf =
phiCorrCoeff2.boundaryFieldRef();
forAll(mesh.boundary(), patchi)
......
......@@ -163,7 +163,7 @@ JohnsonJacksonSchaeffer::nu
const fvPatchList& patches = phase.mesh().boundary();
const volVectorField& U = phase.U();
volScalarField::GeometricBoundaryField& nufBf = nuf.boundaryFieldRef();
volScalarField::Boundary& nufBf = nuf.boundaryFieldRef();
forAll(patches, patchi)
{
......
......@@ -152,7 +152,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
const fvPatchList& patches = phase.mesh().boundary();
const volVectorField& U = phase.U();
volScalarField::GeometricBoundaryField& nufBf = nuf.boundaryFieldRef();
volScalarField::Boundary& nufBf = nuf.boundaryFieldRef();
forAll(patches, patchi)
{
......
......@@ -294,7 +294,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......
......@@ -164,7 +164,7 @@ Foam::RASModels::phasePressureModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......@@ -192,7 +192,7 @@ Foam::RASModels::phasePressureModel::pPrimef() const
)
);
surfaceScalarField::GeometricBoundaryField& bpPrime =
surfaceScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......
......@@ -316,7 +316,7 @@ void Foam::twoPhaseSystem::solve()
)
);
surfaceScalarField::GeometricBoundaryField& alphaPhic1Bf =
surfaceScalarField::Boundary& alphaPhic1Bf =
alphaPhic1.boundaryFieldRef();
// Ensure that the flux at inflow BCs is preserved
......
......@@ -147,10 +147,10 @@ while (pimple.correct())
surfaceScalarField phiCorrCoeff2(pos(0.01 - alphaf1Bar));
{
surfaceScalarField::GeometricBoundaryField& phiCorrCoeff1Bf =
surfaceScalarField::Boundary& phiCorrCoeff1Bf =
phiCorrCoeff1.boundaryFieldRef();
surfaceScalarField::GeometricBoundaryField& phiCorrCoeff2Bf =
surfaceScalarField::Boundary& phiCorrCoeff2Bf =
phiCorrCoeff2.boundaryFieldRef();
forAll(mesh.boundary(), patchi)
......
......@@ -278,7 +278,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......
......@@ -170,7 +170,7 @@ Foam::RASModels::phasePressureModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......@@ -198,7 +198,7 @@ Foam::RASModels::phasePressureModel::pPrimef() const
)
);
surfaceScalarField::GeometricBoundaryField& bpPrime =
surfaceScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)
......
......@@ -36,7 +36,7 @@ void Foam::BlendedInterfacialModel<modelType>::correctFixedFluxBCs
GeometricField& field
) const
{
typename GeometricField::GeometricBoundaryField& fieldBf =
typename GeometricField::Boundary& fieldBf =
field.boundaryFieldRef();
forAll(pair_.phase1().phi().boundaryField(), patchi)
......
......@@ -446,7 +446,7 @@ void Foam::twoPhaseSystem::solve()
)
);
surfaceScalarField::GeometricBoundaryField& alphaPhic1Bf =
surfaceScalarField::Boundary& alphaPhic1Bf =
alphaPhic1.boundaryFieldRef();
// Ensure that the flux at inflow BCs is preserved
......
......@@ -291,7 +291,7 @@ void initCreatedPatches
{
GeoField& field = const_cast<GeoField&>(*fieldIter());
typename GeoField::GeometricBoundaryField& fieldBf =
typename GeoField::Boundary& fieldBf =
field.boundaryFieldRef();
forAll(fieldBf, patchi)
......
......@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
}
}
volScalarField::GeometricBoundaryField& postRefLevelBf =
volScalarField::Boundary& postRefLevelBf =
postRefLevel.boundaryFieldRef();
// For volScalarField: set boundary values to same as cell.
......
......@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
V.dimensionedInternalFieldRef() = mesh.V();
volScalarField::GeometricBoundaryField& Vbf = V.boundaryFieldRef();
volScalarField::Boundary& Vbf = V.boundaryFieldRef();
forAll(Vbf, patchi)
{
......
......@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
0.0*sigma.component(symmTensor::YZ)
);
volScalarField::GeometricBoundaryField& sigmaUnBf =
volScalarField::Boundary& sigmaUnBf =
sigmaUn.boundaryFieldRef();
forAll(sigmaUn.boundaryField(), patchi)
......
......@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
)
);
volVectorField::GeometricBoundaryField& wallGradUBf =
volVectorField::Boundary& wallGradUBf =
wallGradU.boundaryFieldRef();
const fvPatchList& patches = mesh.boundary();
......
......@@ -67,13 +67,13 @@ int main(int argc, char *argv[])
)*fvc::snGrad(h)
);
const surfaceScalarField::GeometricBoundaryField& patchHeatFlux =
const surfaceScalarField::Boundary& patchHeatFlux =
heatFlux.boundaryField();
const volScalarField::GeometricBoundaryField& patchRadHeatFlux =
const volScalarField::Boundary& patchRadHeatFlux =
Qr.boundaryField();
const surfaceScalarField::GeometricBoundaryField& magSf =
const surfaceScalarField::Boundary& magSf =
mesh.magSf().boundaryField();
Info<< "\nWall heat fluxes [W]" << endl;
......@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
dimensionedScalar("wallHeatFlux", heatFlux.dimensions(), 0.0)
);
volScalarField::GeometricBoundaryField& wallHeatFluxBf =
volScalarField::Boundary& wallHeatFluxBf =
wallHeatFlux.boundaryFieldRef();
forAll(wallHeatFluxBf, patchi)
......@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
)
);
volScalarField::GeometricBoundaryField& totalWallHeatFluxBf =
volScalarField::Boundary& totalWallHeatFluxBf =
totalWallHeatFlux.boundaryFieldRef();
forAll(totalWallHeatFluxBf, patchi)
......
......@@ -60,7 +60,7 @@ void calcIncompressible
const volSymmTensorField Reff(model->devReff());
volVectorField::GeometricBoundaryField& wallShearStressBf =
volVectorField::Boundary& wallShearStressBf =
wallShearStress.boundaryFieldRef();
forAll(wallShearStressBf, patchi)
......@@ -112,7 +112,7 @@ void calcCompressible
const volSymmTensorField Reff(model->devRhoReff());