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

GeometricField::GeometricBoundaryField -> GeometricField::Boundary

Browse Source 
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 4a57b9be2e

This is a very simple text substitution change which can be applied to
any code which compiles with the OpenFOAM-dev libraries.
This commit is contained in:
Henry Weller 2016-04-28 07:22:02 +01:00
parent 4a57b9be2e
commit ea5401c770
164 changed files with 396 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
View File

@ -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)
{

6
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View File

@ -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)
{

4
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View File

@ -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();

4
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
View File

@ -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

2
applications/solvers/multiphase/interFoam/alphaEqn.H
View File

@ -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

10
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -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();

4
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H
View File

@ -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

10
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -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)

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
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-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

2
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -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)

4
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -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();

4
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
View File

@ -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;

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
View File

@ -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)
{

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
View File

@ -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)
{

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -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)

6
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -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();

2
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
View File

@ -91,7 +91,7 @@ class multiphaseSystem
(
const phaseModel& alpha1,
const phaseModel& alpha2,
surfaceVectorField::GeometricBoundaryField& nHatb
surfaceVectorField::Boundary& nHatb
) const;
tmp<volScalarField> K

4
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
View File

@ -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)
{

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
View File

@ -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)

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
View File

@ -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)
{

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -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)
{

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -294,7 +294,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -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)

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
View File

@ -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

4
applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H
View File

@ -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)

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -278,7 +278,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const
)
);
volScalarField::GeometricBoundaryField& bpPrime =
volScalarField::Boundary& bpPrime =
tpPrime.ref().boundaryFieldRef();
forAll(bpPrime, patchi)

4
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -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)

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -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)

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
View File

@ -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

2
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -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)

2
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View File

@ -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.

2
applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
View File

@ -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)
{

2
applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
View File

@ -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)

2
applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[])
)
);
volVectorField::GeometricBoundaryField& wallGradUBf =
volVectorField::Boundary& wallGradUBf =
wallGradU.boundaryFieldRef();
const fvPatchList& patches = mesh.boundary();

10
applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
View File

@ -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)

4
applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
View File

@ -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());
volVectorField::GeometricBoundaryField& wallShearStressBf =
volVectorField::Boundary& wallShearStressBf =
wallShearStress.boundaryFieldRef();
forAll(wallShearStressBf, patchi)

10
applications/utilities/postProcessing/wall/yPlus/yPlus.C
View File

@ -57,18 +57,18 @@ void calcYPlus
volScalarField& yPlus
)
{
volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
volScalarField::Boundary d = nearWallDist(mesh).y();
const volScalarField::GeometricBoundaryField nutBf =
const volScalarField::Boundary nutBf =
turbulenceModel->nut()().boundaryField();
const volScalarField::GeometricBoundaryField nuEffBf =
const volScalarField::Boundary nuEffBf =
turbulenceModel->nuEff()().boundaryField();
const volScalarField::GeometricBoundaryField nuBf =
const volScalarField::Boundary nuBf =
turbulenceModel->nu()().boundaryField();
volScalarField::GeometricBoundaryField& yPlusBf =
volScalarField::Boundary& yPlusBf =
yPlus.boundaryFieldRef();
const fvPatchList& patches = mesh.boundary();

2
applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C
View File

@ -52,7 +52,7 @@ void processField
if (fieldObjbjects.lookup(fieldName) != NULL)
{
fieldType vtf(*fieldObjbjects.lookup(fieldName), mesh);
const typename fieldType::GeometricBoundaryField& bf =
const typename fieldType::Boundary& bf =
vtf.boundaryField();
forAll(bf, patchi)

2
applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
View File

@ -169,7 +169,7 @@ int main(int argc, char *argv[])
dimensionedScalar("facesAgglomeration", dimless, 0)
);
volScalarField::GeometricBoundaryField& facesAgglomerationBf =
volScalarField::Boundary& facesAgglomerationBf =
facesAgglomeration.boundaryFieldRef();
label coarsePatchIndex = 0;

4
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -99,7 +99,7 @@ bool setCellFieldType
}
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& fieldBf = field.boundaryFieldRef();
Boundary& fieldBf = field.boundaryFieldRef();
forAll(field.boundaryField(), patchi)
{
@ -277,7 +277,7 @@ bool setFaceFieldType
Pstream::listCombineScatter(nChanged);
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& fieldBf = field.boundaryFieldRef();
Boundary& fieldBf = field.boundaryFieldRef();
// Reassign.
forAll(field.boundaryField(), patchi)

4
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -338,7 +338,7 @@ int main(int argc, char *argv[])
labelList viewFactorsPatches(patches.size());
const volScalarField::GeometricBoundaryField& Qrb = Qr.boundaryField();
const volScalarField::Boundary& Qrb = Qr.boundaryField();
label count = 0;
forAll(Qrb, patchi)
@ -831,7 +831,7 @@ int main(int argc, char *argv[])
dimensionedScalar("viewFactorField", dimless, 0)
);
volScalarField::GeometricBoundaryField& viewFactorFieldBf =
volScalarField::Boundary& viewFactorFieldBf =
viewFactorField.boundaryFieldRef();
label compactI = 0;

72
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
View File

@ -29,7 +29,7 @@ License
#include "cyclicPolyPatch.H"
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
readField
(
const DimensionedField<Type, GeoMesh>& field,
@ -199,8 +199,8 @@ readField
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const BoundaryMesh& bmesh
)
@ -211,8 +211,8 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const BoundaryMesh& bmesh,
const DimensionedField<Type, GeoMesh>& field,
@ -244,8 +244,8 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const BoundaryMesh& bmesh,
const DimensionedField<Type, GeoMesh>& field,
@ -312,8 +312,8 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const BoundaryMesh& bmesh,
const DimensionedField<Type, GeoMesh>& field,
@ -336,12 +336,12 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const DimensionedField<Type, GeoMesh>& field,
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& btf
Boundary& btf
)
:
FieldField<PatchField, Type>(btf.size()),
@ -360,11 +360,11 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& btf
Boundary& btf
)
:
FieldField<PatchField, Type>(btf),
@ -378,8 +378,8 @@ GeometricBoundaryField
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
Boundary
(
const BoundaryMesh& bmesh,
const DimensionedField<Type, GeoMesh>& field,
@ -396,7 +396,7 @@ GeometricBoundaryField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
updateCoeffs()
{
if (debug)
@ -412,7 +412,7 @@ updateCoeffs()
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
evaluate()
{
if (debug)
@ -479,7 +479,7 @@ evaluate()
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::wordList
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
types() const
{
const FieldField<PatchField, Type>& pff = *this;
@ -496,11 +496,11 @@ types() const
template<class Type, template<class> class PatchField, class GeoMesh>
typename Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
typename Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
boundaryInternalField() const
{
typename GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField
typename GeometricField<Type, PatchField, GeoMesh>::Boundary
BoundaryInternalField(*this);
forAll(BoundaryInternalField, patchi)
@ -515,7 +515,7 @@ boundaryInternalField() const
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::LduInterfaceFieldPtrsList<Type>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
interfaces() const
{
LduInterfaceFieldPtrsList<Type> interfaces(this->size());
@ -541,7 +541,7 @@ interfaces() const
template<class Type, template<class> class PatchField, class GeoMesh>
Foam::lduInterfaceFieldPtrsList
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
scalarInterfaces() const
{
lduInterfaceFieldPtrsList interfaces(this->size());
@ -566,7 +566,7 @@ scalarInterfaces() const
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
writeEntry(const word& keyword, Ostream& os) const
{
os << keyword << nl << token::BEGIN_BLOCK << incrIndent << nl;
@ -584,7 +584,7 @@ writeEntry(const word& keyword, Ostream& os) const
// Check state of IOstream
os.check
(
"GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::"
"GeometricField<Type, PatchField, GeoMesh>::Boundary::"
"writeEntry(const word& keyword, Ostream& os) const"
);
}
@ -593,11 +593,11 @@ writeEntry(const word& keyword, Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator=
(
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& bf
Boundary& bf
)
{
FieldField<PatchField, Type>::operator=(bf);
@ -605,7 +605,7 @@ operator=
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator=
(
const FieldField<PatchField, Type>& ptff
@ -616,7 +616,7 @@ operator=
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator=
(
const Type& t
@ -627,11 +627,11 @@ operator=
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator==
(
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& bf
Boundary& bf
)
{
forAll((*this), patchi)
@ -642,7 +642,7 @@ operator==
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator==
(
const FieldField<PatchField, Type>& ptff
@ -656,7 +656,7 @@ operator==
template<class Type, template<class> class PatchField, class GeoMesh>
void Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField::
void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
operator==
(
const Type& t
@ -676,7 +676,7 @@ Foam::Ostream& Foam::operator<<
(
Ostream& os,
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& bf
Boundary& bf
)
{
os << static_cast<const FieldField<PatchField, Type>&>(bf);

2
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -711,7 +711,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::internalField()
template<class Type, template<class> class PatchField, class GeoMesh>
typename
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricBoundaryField&
Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary&
Foam::GeometricField<Type, PatchField, GeoMesh>::boundaryFieldRef()
{
this->setUpToDate();

40
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
View File

@ -30,7 +30,7 @@ Description
SourceFiles
GeometricFieldI.H
GeometricField.C
GeometricBoundaryField.C
Boundary.C
GeometricFieldFunctions.H
GeometricFieldFunctions.C
@ -99,18 +99,18 @@ public:
typedef typename GeoMesh::Mesh Mesh;
//- Type of boundary mesh on which this
// GeometricField::GeometricBoundaryField is instantiated
// GeometricField::Boundary is instantiated
typedef typename GeoMesh::BoundaryMesh BoundaryMesh;
//- Type of the internal field from which this GeometricField is derived
typedef DimensionedField<Type, GeoMesh> Internal;
//- Type of the patch field of which the
// GeometricField::GeometricBoundaryField is composed
// GeometricField::Boundary is composed
typedef PatchField<Type> Patch;
class GeometricBoundaryField
class Boundary
:
public FieldField<PatchField, Type>
{
@ -125,12 +125,12 @@ public:
// Constructors
//- Construct from a BoundaryMesh
GeometricBoundaryField(const BoundaryMesh&);
Boundary(const BoundaryMesh&);
//- Construct from a BoundaryMesh,
// reference to the internal field
// and a patch type
GeometricBoundaryField
Boundary
(
const BoundaryMesh&,
const Internal&,
@ -141,7 +141,7 @@ public:
// reference to the internal field
// and a wordList of patch types and optional the actual patch
// types (to override constraint patches)
GeometricBoundaryField
Boundary
(
const BoundaryMesh&,
const Internal&,
@ -152,7 +152,7 @@ public:
//- Construct from a BoundaryMesh,
// reference to the internal field
// and a PtrList<PatchField<Type>>
GeometricBoundaryField
Boundary
(
const BoundaryMesh&,
const Internal&,
@ -160,10 +160,10 @@ public:
);
//- Construct as copy setting the reference to the internal field
GeometricBoundaryField
Boundary
(
const Internal&,
const GeometricBoundaryField&
const Boundary&
);
//- Construct as copy
@ -171,13 +171,13 @@ public:
// Need new type of BoundaryField, one which is part of a geometric
// field for which snGrad etc. may be called and a free standing
// BoundaryField for which such operations are unavailable.
GeometricBoundaryField
Boundary
(
const GeometricBoundaryField&
const Boundary&
);
//- Construct from dictionary
GeometricBoundaryField
Boundary
(
const BoundaryMesh&,
const Internal&,
@ -205,7 +205,7 @@ public:
//- Return BoundaryField of the cell values neighbouring
// the boundary
GeometricBoundaryField boundaryInternalField() const;
Boundary boundaryInternalField() const;
//- Return a list of pointers for each patch field with only those
// pointing to interfaces being set
@ -222,7 +222,7 @@ public:
// Member operators
//- Assignment to BoundaryField<Type, PatchField, BoundaryMesh>
void operator=(const GeometricBoundaryField&);
void operator=(const Boundary&);
//- Assignment to FieldField<PatchField, Type>
void operator=(const FieldField<PatchField, Type>&);
@ -233,7 +233,7 @@ public:
//- Forced assignment to
// BoundaryField<Type, PatchField, BoundaryMesh>
void operator==(const GeometricBoundaryField&);
void operator==(const Boundary&);
//- Forced assignment to FieldField<PatchField, Type>
void operator==(const FieldField<PatchField, Type>&);
@ -258,7 +258,7 @@ private:
mutable GeometricField<Type, PatchField, GeoMesh>* fieldPrevIterPtr_;
//- Boundary Type field containing boundary field values
GeometricBoundaryField boundaryField_;
Boundary boundaryField_;
// Private Member Functions
@ -460,10 +460,10 @@ public:
//- Return a reference to the boundary field
// Note: this increments the event counter and checks the
// old-time fields; avoid in loops.
GeometricBoundaryField& boundaryFieldRef();
Boundary& boundaryFieldRef();
//- Return const-reference to the boundary field
inline const GeometricBoundaryField& boundaryField() const;
inline const Boundary& boundaryField() const;
//- Return the time index of the field
inline label timeIndex() const;
@ -627,7 +627,7 @@ Ostream& operator<<
(
Ostream&,
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField&
Boundary&
);

2
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
View File

@ -67,7 +67,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::internalField() const
template<class Type, template<class> class PatchField, class GeoMesh>
inline const typename Foam::GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField&
Boundary&
Foam::GeometricField<Type, PatchField, GeoMesh>::boundaryField() const
{
return boundaryField_;

2
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
View File

@ -47,7 +47,7 @@ bool reusable(const tmp<GeometricField<Type, PatchField, GeoMesh>>& tgf)
{
const GeometricField<Type, PatchField, GeoMesh>& gf = tgf();
const typename GeometricField<Type, PatchField, GeoMesh>::
GeometricBoundaryField& gbf = gf.boundaryField();
Boundary& gbf = gf.boundaryField();
forAll(gbf, patchi)
{

2
src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
View File

@ -132,7 +132,7 @@ void MapGeometricFields
// Map the patch fields
typename GeometricField<Type, PatchField, GeoMesh>
::GeometricBoundaryField& bfield = field.boundaryFieldRef();
::Boundary& bfield = field.boundaryFieldRef();
forAll(bfield, patchi)
{
// Cannot check sizes for patch fields because of

4
src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
View File

@ -61,7 +61,7 @@ public:
typedef oneField Internal;
typedef oneField Patch;
typedef oneFieldField GeometricBoundaryField;
typedef oneFieldField Boundary;
typedef one cmptType;
// Constructors
@ -87,7 +87,7 @@ public:
inline typename Internal::FieldType internalField() const;
inline GeometricBoundaryField boundaryField() const;
inline Boundary boundaryField() const;
};

4
src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
View File

@ -72,10 +72,10 @@ Foam::geometricOneField::internalField() const
}
inline Foam::geometricOneField::GeometricBoundaryField
inline Foam::geometricOneField::Boundary
Foam::geometricOneField::boundaryField() const
{
return GeometricBoundaryField();
return Boundary();
}

6
src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
View File

@ -173,7 +173,7 @@ wordList mixtureKEpsilon<BasicTurbulenceModel>::epsilonBoundaryTypes
const volScalarField& epsilon
) const
{
const volScalarField::GeometricBoundaryField& ebf = epsilon.boundaryField();
const volScalarField::Boundary& ebf = epsilon.boundaryField();
wordList ebt = ebf.types();
@ -196,8 +196,8 @@ void mixtureKEpsilon<BasicTurbulenceModel>::correctInletOutlet
const volScalarField& refVsf
) const
{
volScalarField::GeometricBoundaryField& bf = vsf.boundaryFieldRef();
const volScalarField::GeometricBoundaryField& refBf =
volScalarField::Boundary& bf = vsf.boundaryFieldRef();
const volScalarField::Boundary& refBf =
refVsf.boundaryField();
forAll(bf, patchi)

2
src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C
View File

@ -64,7 +64,7 @@ void Foam::LESModels::vanDriestDelta::calcDelta()
);
const fvPatchList& patches = mesh.boundary();
volScalarField::GeometricBoundaryField& ystarBf = ystar.boundaryFieldRef();
volScalarField::Boundary& ystarBf = ystar.boundaryFieldRef();
forAll(patches, patchi)
{

2
src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C
View File

@ -63,7 +63,7 @@ void Foam::ReynoldsStress<BasicTurbulenceModel>::correctWallShearStress
{
const fvPatchList& patches = this->mesh_.boundary();
volSymmTensorField::GeometricBoundaryField& RBf = R.boundaryFieldRef();
volSymmTensorField::Boundary& RBf = R.boundaryFieldRef();
forAll(patches, patchi)
{

8
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View File

@ -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
@ -72,7 +72,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::setMaster()
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
const volScalarField::Boundary& bf = epsilon.boundaryField();
label master = -1;
forAll(bf, patchi)
@ -97,7 +97,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights()
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
const volScalarField::Boundary& bf = epsilon.boundaryField();
const fvMesh& mesh = epsilon.mesh();
@ -157,7 +157,7 @@ Foam::epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchi)
const volScalarField& epsilon =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField();
const volScalarField::Boundary& bf = epsilon.boundaryField();
const epsilonWallFunctionFvPatchScalarField& epf =
refCast<const epsilonWallFunctionFvPatchScalarField>(bf[patchi]);

6
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View File

@ -76,7 +76,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster()
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
const volScalarField::Boundary& bf = omega.boundaryField();
label master = -1;
forAll(bf, patchi)
@ -101,7 +101,7 @@ void omegaWallFunctionFvPatchScalarField::createAveragingWeights()
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
const volScalarField::Boundary& bf = omega.boundaryField();
const fvMesh& mesh = omega.mesh();
@ -162,7 +162,7 @@ omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchi)
const volScalarField& omega =
static_cast<const volScalarField&>(this->dimensionedInternalField());
const volScalarField::GeometricBoundaryField& bf = omega.boundaryField();
const volScalarField::Boundary& bf = omega.boundaryField();
const omegaWallFunctionFvPatchScalarField& opf =
refCast<const omegaWallFunctionFvPatchScalarField>(bf[patchi]);

2
src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
View File

@ -111,7 +111,7 @@ Foam::tmp<Foam::volScalarField> Foam::consumptionSpeed::omega0Sigma
iomega0[celli] = omega0Sigma(sigma[celli], 1.0);
}
volScalarField::GeometricBoundaryField& bomega0 = omega0.boundaryFieldRef();
volScalarField::Boundary& bomega0 = omega0.boundaryFieldRef();
forAll(bomega0, patchi)
{

4
src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
View File

@ -384,7 +384,7 @@ Foam::dynamicRefineFvMesh::refine
}
// Recalculate new boundary faces.
surfaceScalarField::GeometricBoundaryField& phiBf =
surfaceScalarField::Boundary& phiBf =
phi.boundaryFieldRef();
forAll(phiBf, patchi)
{
@ -574,7 +574,7 @@ Foam::dynamicRefineFvMesh::unrefine
}
surfaceScalarField& phi = *iter();
surfaceScalarField::GeometricBoundaryField& phiBf =
surfaceScalarField::Boundary& phiBf =
phi.boundaryFieldRef();
const surfaceScalarField phiU

4
src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
View File

@ -62,7 +62,7 @@ void Foam::fvMeshAdder::MapVolField
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& bfld = fld.boundaryFieldRef();
Boundary& bfld = fld.boundaryFieldRef();
{
const labelList& oldPatchMap = meshMap.oldPatchMap();
@ -330,7 +330,7 @@ void Foam::fvMeshAdder::MapSurfaceField
const labelList& oldPatchStarts = meshMap.oldPatchStarts();
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& bfld = fld.boundaryFieldRef();
Boundary& bfld = fld.boundaryFieldRef();
// Internal field
// ~~~~~~~~~~~~~~

4
src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
View File

@ -113,7 +113,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
forAllIter(typename HashTable<fldType*>, flds, iter)
{
fldType& fld = *iter();
typename fldType::GeometricBoundaryField& bfld =
typename fldType::Boundary& bfld =
fld.boundaryFieldRef();
const FieldField<fvsPatchField, T>& oldBfld = oldBflds[fieldI++];
@ -161,7 +161,7 @@ void Foam::fvMeshDistribute::initPatchFields
{
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
typename GeoField::Boundary& bfld =
fld.boundaryFieldRef();
forAll(bfld, patchi)

8
src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.C
View File

@ -47,7 +47,7 @@ void Foam::fvMeshTools::addPatchFields
{
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
typename GeoField::Boundary& bfld =
fld.boundaryFieldRef();
label sz = bfld.size();
@ -101,7 +101,7 @@ void Foam::fvMeshTools::setPatchFields
{
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
typename GeoField::Boundary& bfld =
fld.boundaryFieldRef();
if (patchFieldDict.found(fld.name()))
@ -140,7 +140,7 @@ void Foam::fvMeshTools::setPatchFields
{
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
typename GeoField::Boundary& bfld =
fld.boundaryFieldRef();
bfld[patchi] == value;
@ -182,7 +182,7 @@ void Foam::fvMeshTools::reorderPatchFields
{
GeoField& fld = *iter();
typename GeoField::GeometricBoundaryField& bfld =
typename GeoField::Boundary& bfld =
fld.boundaryFieldRef();
bfld.reorder(oldToNew);

6
src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
View File

@ -428,7 +428,7 @@ void Foam::motionSmootherAlgo::setDisplacementPatchFields
pointVectorField& displacement
)
{
pointVectorField::GeometricBoundaryField& displacementBf =
pointVectorField::Boundary& displacementBf =
displacement.boundaryFieldRef();
// Adapt the fixedValue bc's (i.e. copy internal point data to
@ -584,7 +584,7 @@ void Foam::motionSmootherAlgo::correctBoundaryConditions
const lduSchedule& patchSchedule = mesh_.globalData().patchSchedule();
pointVectorField::GeometricBoundaryField& displacementBf =
pointVectorField::Boundary& displacementBf =
displacement.boundaryFieldRef();
// 1. evaluate on adaptPatches
@ -771,7 +771,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
wordList actualPatchFieldTypes;
{
const pointVectorField::GeometricBoundaryField& pfld =
const pointVectorField::Boundary& pfld =
displacement_.boundaryField();
actualPatchFieldTypes.setSize(pfld.size());
forAll(pfld, patchi)

2
src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
View File

@ -57,7 +57,7 @@ void Foam::motionSmootherAlgo::checkConstraints
}
typename FldType::GeometricBoundaryField& bFld = pf.boundaryField();
typename FldType::Boundary& bFld = pf.boundaryField();
// Evaluate in reverse order

8
src/finiteVolume/cfdTools/general/CorrectPhi/correctUphiBCs.C
View File

@ -37,8 +37,8 @@ void Foam::correctUphiBCs
if (mesh.changing())
{
volVectorField::GeometricBoundaryField& Ubf = U.boundaryFieldRef();
surfaceScalarField::GeometricBoundaryField& phibf =
volVectorField::Boundary& Ubf = U.boundaryFieldRef();
surfaceScalarField::Boundary& phibf =
phi.boundaryFieldRef();
forAll(Ubf, patchi)
@ -73,8 +73,8 @@ void Foam::correctUphiBCs
if (mesh.changing())
{
volVectorField::GeometricBoundaryField& Ubf = U.boundaryFieldRef();
surfaceScalarField::GeometricBoundaryField& phibf =
volVectorField::Boundary& Ubf = U.boundaryFieldRef();
surfaceScalarField::Boundary& phibf =
phi.boundaryFieldRef();
forAll(Ubf, patchi)

6
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
View File

@ -419,7 +419,7 @@ void Foam::MRFZone::makeRelative(volVectorField& U) const
// Included patches
volVectorField::GeometricBoundaryField& Ubf = U.boundaryFieldRef();
volVectorField::Boundary& Ubf = U.boundaryFieldRef();
forAll(includedFaces_, patchi)
{
@ -487,7 +487,7 @@ void Foam::MRFZone::makeAbsolute(volVectorField& U) const
}
// Included patches
volVectorField::GeometricBoundaryField& Ubf = U.boundaryFieldRef();
volVectorField::Boundary& Ubf = U.boundaryFieldRef();
forAll(includedFaces_, patchi)
{
@ -533,7 +533,7 @@ void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
const vector Omega = this->Omega();
// Included patches
volVectorField::GeometricBoundaryField& Ubf = U.boundaryFieldRef();
volVectorField::Boundary& Ubf = U.boundaryFieldRef();
forAll(includedFaces_, patchi)
{

2
src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C
View File

@ -399,7 +399,7 @@ void Foam::MRFZoneList::correctBoundaryFlux
);
surfaceScalarField::GeometricBoundaryField& phibf = phi.boundaryFieldRef();
surfaceScalarField::Boundary& phibf = phi.boundaryFieldRef();
forAll(mesh_.boundary(), patchi)
{

2
src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
View File

@ -154,7 +154,7 @@ void Foam::MRFZone::makeAbsoluteRhoFlux
phii[facei] += rho[facei]*(Omega ^ (Cfi[facei] - origin_)) & Sfi[facei];
}
surfaceScalarField::GeometricBoundaryField& phibf = phi.boundaryFieldRef();
surfaceScalarField::Boundary& phibf = phi.boundaryFieldRef();
// Included patches

4
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
View File

@ -231,8 +231,8 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
Uabs.internalField() += Urel_.internalField();
// Add Urel boundary contributions
volVectorField::GeometricBoundaryField& Uabsbf = Uabs.boundaryFieldRef();
const volVectorField::GeometricBoundaryField& bvf = Urel_.boundaryField();
volVectorField::Boundary& Uabsbf = Uabs.boundaryFieldRef();
const volVectorField::Boundary& bvf = Urel_.boundaryField();
forAll(bvf, i)
{

2
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
View File

@ -43,7 +43,7 @@ bool Foam::adjustPhi
scalar fixedMassOut = 0.0;
scalar adjustableMassOut = 0.0;
surfaceScalarField::GeometricBoundaryField& bphi =
surfaceScalarField::Boundary& bphi =
phi.boundaryFieldRef();
forAll(bphi, patchi)

2
src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C
View File

@ -49,7 +49,7 @@ Foam::tmp<Foam::volVectorField> Foam::constrainHbyA
}
volVectorField& HbyA = tHbyANew.ref();
volVectorField::GeometricBoundaryField& HbyAbf = HbyA.boundaryFieldRef();
volVectorField::Boundary& HbyAbf = HbyA.boundaryFieldRef();
forAll(U.boundaryField(), patchi)
{

12
src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C
View File

@ -44,16 +44,16 @@ void Foam::constrainPressure
{
const fvMesh& mesh = p.mesh();
volScalarField::GeometricBoundaryField& pBf = p.boundaryFieldRef();
volScalarField::Boundary& pBf = p.boundaryFieldRef();
const volVectorField::GeometricBoundaryField& UBf = U.boundaryField();
const surfaceScalarField::GeometricBoundaryField& phiHbyABf =
const volVectorField::Boundary& UBf = U.boundaryField();
const surfaceScalarField::Boundary& phiHbyABf =
phiHbyA.boundaryField();
const typename RAUType::GeometricBoundaryField& rhorAUBf =
const typename RAUType::Boundary& rhorAUBf =
rhorAU.boundaryField();
const surfaceVectorField::GeometricBoundaryField& SfBf =
const surfaceVectorField::Boundary& SfBf =
mesh.Sf().boundaryField();
const surfaceScalarField::GeometricBoundaryField& magSfBf =
const surfaceScalarField::Boundary& magSfBf =
mesh.magSf().boundaryField();
forAll(pBf, patchi)

10
src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -68,7 +68,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::setMaster
volFieldType& vf = const_cast<volFieldType&>(cvf);
typename volFieldType::GeometricBoundaryField& bf = vf.boundaryFieldRef();
typename volFieldType::Boundary& bf = vf.boundaryFieldRef();
// number of patches can be different in parallel...
label nPatch = bf.size();
@ -244,7 +244,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::startWait() const
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
const typename volFieldType::GeometricBoundaryField& bf =
const typename volFieldType::Boundary& bf =
cvf.boundaryField();
forAll(coupledPatchIDs_, i)
@ -408,7 +408,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeData
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
const typename volFieldType::GeometricBoundaryField& bf =
const typename volFieldType::Boundary& bf =
cvf.boundaryField();
forAll(coupledPatchIDs_, i)
@ -612,7 +612,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::initialise
volFieldType& vf = const_cast<volFieldType&>(cvf);
typename volFieldType::GeometricBoundaryField& bf = vf.boundaryFieldRef();
typename volFieldType::Boundary& bf = vf.boundaryFieldRef();
// identify all coupled patches
DynamicList<label> coupledPatchIDs(bf.size());
@ -779,7 +779,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeGeometry() const
const volFieldType& cvf =
static_cast<const volFieldType&>(this->dimensionedInternalField());
const typename volFieldType::GeometricBoundaryField& bf =
const typename volFieldType::Boundary& bf =
cvf.boundaryField();
OFstream osPoints(baseDir()/"patchPoints");

4
src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H
View File

@ -167,7 +167,7 @@ namespace Foam
template<class GradBC>
inline void setSnGrad
(
volScalarField::GeometricBoundaryField& bf,
volScalarField::Boundary& bf,
const FieldField<fvsPatchField, scalar>& snGrad
)
{
@ -183,7 +183,7 @@ namespace Foam
template<class GradBC>
inline void setSnGrad
(
volScalarField::GeometricBoundaryField& bf,
volScalarField::Boundary& bf,
const tmp<FieldField<fvsPatchField, scalar>>& tsnGrad
)
{

2
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
View File

@ -75,7 +75,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
max(corDeltaT[neighbour[facei]], cofrDeltaT[facei]);
}
const surfaceScalarField::GeometricBoundaryField& cofrDeltaTbf =
const surfaceScalarField::Boundary& cofrDeltaTbf =
cofrDeltaT.boundaryField();
forAll(cofrDeltaTbf, patchi)

16
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
View File

@ -367,7 +367,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -460,7 +460,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -553,7 +553,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -657,7 +657,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -795,7 +795,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -880,7 +880,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -966,7 +966,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{
@ -1061,7 +1061,7 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
if (mesh().moving())
{
typename DDt0Field<GeometricField<Type, fvPatchField, volMesh>>::
GeometricBoundaryField& ddt0bf = ddt0.boundaryFieldRef();
Boundary& ddt0bf = ddt0.boundaryFieldRef();
if (evaluate(ddt0))
{

2
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
View File

@ -150,7 +150,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff.ref();
surfaceScalarField::GeometricBoundaryField& ccbf =
surfaceScalarField::Boundary& ccbf =
ddtCouplingCoeff.boundaryFieldRef();
forAll(U.boundaryField(), patchi)

2
src/finiteVolume/finiteVolume/fvc/fvcAverage.C
View File

@ -74,7 +74,7 @@ average
);
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& bav = av.boundaryFieldRef();
Boundary& bav = av.boundaryFieldRef();
forAll(bav, patchi)
{

2
src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
View File

@ -86,7 +86,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
rf[nei] -= (Sf[facei] & (Cf[facei] - C[nei]))*ssf[facei]/magSf[facei];
}
const surfaceScalarField::GeometricBoundaryField& bsf = ssf.boundaryField();
const surfaceScalarField::Boundary& bsf = ssf.boundaryField();
forAll(bsf, patchi)
{

2
src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
View File

@ -97,7 +97,7 @@ reconstruct
}
const typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& bsf = ssf.boundaryField();
Boundary& bsf = ssf.boundaryField();
forAll(bsf, patchi)
{

2
src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
View File

@ -153,7 +153,7 @@ void Foam::fv::gaussGrad<Type>::correctBoundaryConditions
typename GeometricField
<
typename outerProduct<vector, Type>::type, fvPatchField, volMesh
>::GeometricBoundaryField& gGradbf = gGrad.boundaryFieldRef();
>::Boundary& gGradbf = gGrad.boundaryFieldRef();
forAll(vsf.boundaryField(), patchi)
{

2
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
View File

@ -110,7 +110,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
}
surfaceVectorField::GeometricBoundaryField& blsP =
surfaceVectorField::Boundary& blsP =
pVectors_.boundaryField();
forAll(blsP, patchi)

2
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
View File

@ -114,7 +114,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
}
surfaceVectorField::GeometricBoundaryField& pVectorsBf =
surfaceVectorField::Boundary& pVectorsBf =
pVectors_.boundaryFieldRef();
forAll(pVectorsBf, patchi)

2
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
View File

@ -109,7 +109,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
}
surfaceVectorField::GeometricBoundaryField& blsP =
surfaceVectorField::Boundary& blsP =
pVectors_.boundaryField();
forAll(blsP, patchi)

4
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
View File

@ -81,7 +81,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
}
const volScalarField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volScalarField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{
@ -235,7 +235,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
}
const volVectorField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volVectorField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{

4
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
View File

@ -81,7 +81,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
}
const volScalarField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volScalarField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{
@ -224,7 +224,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
}
const volVectorField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volVectorField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{

4
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
View File

@ -98,7 +98,7 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
);
}
const volScalarField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volScalarField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{
@ -249,7 +249,7 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
}
const volVectorField::GeometricBoundaryField& bvf = vvf.boundaryField();
const volVectorField::Boundary& bvf = vvf.boundaryField();
forAll(bvf, patchi)
{

4
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
View File

@ -102,7 +102,7 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
);
}
const volScalarField::GeometricBoundaryField& bsf = vsf.boundaryField();
const volScalarField::Boundary& bsf = vsf.boundaryField();
forAll(bsf, patchi)
{
@ -244,7 +244,7 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
}
const volVectorField::GeometricBoundaryField& bvf = vvf.boundaryField();
const volVectorField::Boundary& bvf = vvf.boundaryField();
forAll(bvf, patchi)
{

4
src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
View File

@ -232,8 +232,8 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit()
);
}
const surfaceScalarField::GeometricBoundaryField& bw = w.boundaryField();
const surfaceScalarField::GeometricBoundaryField& bdC = dC.boundaryField();
const surfaceScalarField::Boundary& bw = w.boundaryField();
const surfaceScalarField::Boundary& bdC = dC.boundaryField();
forAll(bw, patchi)
{

2
src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
View File

@ -139,7 +139,7 @@ snGradScheme<Type>::snGrad
}
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& ssfbf = ssf.boundaryFieldRef();
Boundary& ssfbf = ssf.boundaryFieldRef();
forAll(vf.boundaryField(), patchi)
{

4
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -678,7 +678,7 @@ template<class Type>
void Foam::fvMatrix<Type>::boundaryManipulate
(
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& bFields
Boundary& bFields
)
{
forAll(bFields, patchi)
@ -929,7 +929,7 @@ flux() const
}
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& ffbf = fieldFlux.boundaryFieldRef();
Boundary& ffbf = fieldFlux.boundaryFieldRef();
forAll(ffbf, patchi)
{

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
View File

@ -376,7 +376,7 @@ public:
void boundaryManipulate
(
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& values
Boundary& values
);
//- Construct and return the solver

8
src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
View File

@ -145,7 +145,7 @@ void Foam::MULES::limiterCorr
)
{
const scalarField& psiIf = psi;
const volScalarField::GeometricBoundaryField& psiBf = psi.boundaryField();
const volScalarField::Boundary& psiBf = psi.boundaryField();
const fvMesh& mesh = psi.mesh();
@ -171,11 +171,11 @@ void Foam::MULES::limiterCorr
tmp<volScalarField::Internal> tVsc = mesh.Vsc();
const scalarField& V = tVsc();
const surfaceScalarField::GeometricBoundaryField& phiBf =
const surfaceScalarField::Boundary& phiBf =
phi.boundaryField();
const scalarField& phiCorrIf = phiCorr;
const surfaceScalarField::GeometricBoundaryField& phiCorrBf =
const surfaceScalarField::Boundary& phiCorrBf =
phiCorr.boundaryField();
slicedSurfaceScalarField lambda
@ -196,7 +196,7 @@ void Foam::MULES::limiterCorr
);
scalarField& lambdaIf = lambda;
surfaceScalarField::GeometricBoundaryField& lambdaBf =
surfaceScalarField::Boundary& lambdaBf =
lambda.boundaryFieldRef();
scalarField psiMaxn(psiIf.size(), psiMin);

10
src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
View File

@ -179,7 +179,7 @@ void Foam::MULES::limiter
)
{
const scalarField& psiIf = psi;
const volScalarField::GeometricBoundaryField& psiBf = psi.boundaryField();
const volScalarField::Boundary& psiBf = psi.boundaryField();
const fvMesh& mesh = psi.mesh();
@ -203,11 +203,11 @@ void Foam::MULES::limiter
const scalarField& V = tVsc();
const scalarField& phiBDIf = phiBD;
const surfaceScalarField::GeometricBoundaryField& phiBDBf =
const surfaceScalarField::Boundary& phiBDBf =
phiBD.boundaryField();
const scalarField& phiCorrIf = phiCorr;
const surfaceScalarField::GeometricBoundaryField& phiCorrBf =
const surfaceScalarField::Boundary& phiCorrBf =
phiCorr.boundaryField();
slicedSurfaceScalarField lambda
@ -228,7 +228,7 @@ void Foam::MULES::limiter
);
scalarField& lambdaIf = lambda;
surfaceScalarField::GeometricBoundaryField& lambdaBf =
surfaceScalarField::Boundary& lambdaBf =
lambda.boundaryFieldRef();
scalarField psiMaxn(psiIf.size(), psiMin);
@ -609,7 +609,7 @@ void Foam::MULES::limitSum(SurfaceScalarFieldList& phiPsiCorrs)
limitSum(phiPsiCorrsInternal);
}
const surfaceScalarField::GeometricBoundaryField& bfld =
const surfaceScalarField::Boundary& bfld =
phiPsiCorrs[0].boundaryField();
forAll(bfld, patchi)

2
src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C
View File

@ -135,7 +135,7 @@ Foam::extendedCellToFaceStencil::weightedSum
// Boundaries. Either constrained or calculated so assign value
// directly (instead of nicely using operator==)
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& bSfCorr = sf.boundaryFieldRef();
Boundary& bSfCorr = sf.boundaryFieldRef();
forAll(bSfCorr, patchi)
{

2
src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C
View File

@ -98,7 +98,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
// Boundaries. Either constrained or calculated so assign value
// directly (instead of nicely using operator==)
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& bSfCorr = sf.boundaryFieldRef();
Boundary& bSfCorr = sf.boundaryFieldRef();
forAll(bSfCorr, patchi)
{

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

@ -768,7 +768,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
const fvPatchList& patches = boundary();
surfaceScalarField::GeometricBoundaryField& phibf = phi.boundaryFieldRef();
surfaceScalarField::Boundary& phibf = phi.boundaryFieldRef();
forAll(patches, patchi)
{

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

@ -410,7 +410,7 @@ Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
delta[facei] = C[neighbour[facei]] - C[owner[facei]];
}
surfaceVectorField::GeometricBoundaryField& deltabf =
surfaceVectorField::Boundary& deltabf =
delta.boundaryFieldRef();
forAll(deltabf, patchi)

6
src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
View File

@ -107,7 +107,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> fvMeshSubset::interpolate
// constructor (with reference to the now correct internal field)
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& bf = resF.boundaryFieldRef();
Boundary& bf = resF.boundaryFieldRef();
forAll(bf, patchi)
{
@ -250,7 +250,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvMeshSubset::interpolate
// constructor (with reference to the now correct internal field)
typename GeometricField<Type, fvsPatchField, surfaceMesh>::
GeometricBoundaryField& bf = resF.boundaryFieldRef();
Boundary& bf = resF.boundaryFieldRef();
forAll(bf, patchi)
{
@ -413,7 +413,7 @@ fvMeshSubset::interpolate
// constructor (with reference to the now correct internal field)
typename GeometricField<Type, pointPatchField, pointMesh>::
GeometricBoundaryField& bf = resF.boundaryFieldRef();
Boundary& bf = resF.boundaryFieldRef();
forAll(bf, patchi)
{

2
src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
View File

@ -84,7 +84,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
// constructor (with reference to the now correct internal field)
typename GeometricField<Type, fvPatchField, volMesh>::
GeometricBoundaryField& bf = resF.boundaryFieldRef();
Boundary& bf = resF.boundaryFieldRef();
if (agglomerate())
{

2
src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
View File

@ -93,7 +93,7 @@ void Foam::nearWallDist::calculate()
Foam::nearWallDist::nearWallDist(const Foam::fvMesh& mesh)
:
volScalarField::GeometricBoundaryField
volScalarField::Boundary
(
mesh.boundary(),
mesh.V(), // Dummy internal field,

6
src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.H
View File

@ -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
@ -51,7 +51,7 @@ class fvMesh;
class nearWallDist
:
public volScalarField::GeometricBoundaryField
public volScalarField::Boundary
{
// Private data
@ -85,7 +85,7 @@ public:
// Member Functions
const volScalarField::GeometricBoundaryField& y() const
const volScalarField::Boundary& y() const
{
return *this;
}

4
src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
View File

@ -76,7 +76,7 @@ void Foam::nearWallDistNoSearch::doAll()
Foam::nearWallDistNoSearch::nearWallDistNoSearch(const Foam::fvMesh& mesh)
:
volScalarField::GeometricBoundaryField
volScalarField::Boundary
(
mesh.boundary(),
mesh.V(), // Dummy internal field
@ -100,7 +100,7 @@ void Foam::nearWallDistNoSearch::correct()
{
if (mesh_.changing())
{
// Update size of GeometricBoundaryField
// Update size of Boundary
forAll(mesh_.boundary(), patchi)
{
operator[](patchi).setSize(mesh_.boundary()[patchi].size());

Some files were not shown because too many files have changed in this diff Show More