From 75ea76187b82cffbdc84907e7e57e02997e5025b Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 28 Apr 2016 07:22:02 +0100 Subject: [PATCH] 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 a25a449c9e8f0167302b517dfd2b87135250ec7a This is a very simple text substitution change which can be applied to any code which compiles with the OpenFOAM-dev libraries. --- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 6 +- .../multiphaseMixtureThermo.C | 4 +- .../multiphaseMixtureThermo.H | 4 +- .../solvers/multiphase/interFoam/alphaEqn.H | 2 +- .../threePhaseInterfaceProperties.C | 10 +-- .../threePhaseInterfaceProperties.H | 4 +- .../multiphaseSystem/multiphaseSystem.C | 10 +-- .../multiphaseSystem/multiphaseSystem.H | 4 +- .../multiphase/multiphaseEulerFoam/pEqn.H | 2 +- .../multiphaseMixture/multiphaseMixture.C | 4 +- .../multiphaseMixture/multiphaseMixture.H | 4 +- .../saturationModels/polynomial/polynomial.C | 2 +- .../wallLubricationModel.C | 2 +- .../BlendedInterfacialModel.C | 2 +- .../multiphaseSystem/multiphaseSystem.C | 6 +- .../multiphaseSystem/multiphaseSystem.H | 2 +- .../reactingMultiphaseEulerFoam/pU/pEqn.H | 4 +- .../reactingTwoPhaseEulerFoam/pU/pEqn.H | 4 +- .../JohnsonJacksonSchaefferFrictionalStress.C | 2 +- .../Schaeffer/SchaefferFrictionalStress.C | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 2 +- .../phasePressureModel/phasePressureModel.C | 4 +- .../twoPhaseSystem/twoPhaseSystem.C | 2 +- .../multiphase/twoPhaseEulerFoam/pU/pEqn.H | 4 +- .../kineticTheoryModel/kineticTheoryModel.C | 2 +- .../phasePressureModel/phasePressureModel.C | 4 +- .../BlendedInterfacialModel.C | 2 +- .../twoPhaseSystem/twoPhaseSystem.C | 2 +- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 2 +- .../refinementLevel/refinementLevel.C | 2 +- .../writeCellCentres/writeCellCentres.C | 2 +- .../stressComponents/stressComponents.C | 2 +- .../postProcessing/wall/wallGradU/wallGradU.C | 2 +- .../wall/wallHeatFlux/wallHeatFlux.C | 10 +-- .../wall/wallShearStress/wallShearStress.C | 4 +- .../postProcessing/wall/yPlus/yPlus.C | 10 +-- ...ateExternalCoupledPatchGeometryTemplates.C | 2 +- .../faceAgglomerate/faceAgglomerate.C | 2 +- .../preProcessing/setFields/setFields.C | 4 +- .../viewFactorsGen/viewFactorsGen.C | 4 +- .../GeometricField/GeometricBoundaryField.C | 72 +++++++++---------- .../GeometricField/GeometricField.C | 2 +- .../GeometricField/GeometricField.H | 40 +++++------ .../GeometricField/GeometricFieldI.H | 2 +- .../GeometricFieldReuseFunctions.H | 2 +- .../GeometricField/MapGeometricFields.H | 2 +- .../geometricOneField/geometricOneField.H | 4 +- .../geometricOneField/geometricOneFieldI.H | 4 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 6 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.C | 2 +- .../ReynoldsStress/ReynoldsStress.C | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 8 +-- .../omegaWallFunctionFvPatchScalarField.C | 6 +- .../consumptionSpeed/consumptionSpeed.C | 2 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 4 +- .../fvMeshDistributeTemplates.C | 4 +- .../fvMeshTools/fvMeshToolsTemplates.C | 8 +-- .../motionSmoother/motionSmootherAlgo.C | 6 +- .../motionSmootherAlgoTemplates.C | 2 +- .../general/CorrectPhi/correctUphiBCs.C | 8 +-- .../cfdTools/general/MRF/MRFZone.C | 6 +- .../cfdTools/general/MRF/MRFZoneList.C | 2 +- .../cfdTools/general/MRF/MRFZoneTemplates.C | 2 +- .../general/SRF/SRFModel/SRFModel/SRFModel.C | 4 +- .../cfdTools/general/adjustPhi/adjustPhi.C | 2 +- .../general/constrainHbyA/constrainHbyA.C | 2 +- .../constrainPressure/constrainPressure.C | 12 ++-- .../externalCoupledMixedFvPatchField.C | 10 +-- .../fixedFluxPressureFvPatchScalarField.H | 4 +- .../CoEulerDdtScheme/CoEulerDdtScheme.C | 2 +- .../CrankNicolsonDdtScheme.C | 16 ++--- .../ddtSchemes/ddtScheme/ddtScheme.C | 2 +- .../finiteVolume/fvc/fvcAverage.C | 2 +- .../finiteVolume/fvc/fvcReconstructMag.C | 2 +- .../finiteVolume/fvc/fvcSimpleReconstruct.C | 2 +- .../gradSchemes/gaussGrad/gaussGrad.C | 2 +- .../invDistLeastSquaresVectors.C | 2 +- .../leastSquaresGrad/leastSquaresVectors.C | 2 +- .../unweightedLeastSquaresVectors.C | 2 +- .../cellLimitedGrad/cellLimitedGrads.C | 4 +- .../cellMDLimitedGrad/cellMDLimitedGrads.C | 4 +- .../faceLimitedGrad/faceLimitedGrads.C | 4 +- .../faceMDLimitedGrad/faceMDLimitedGrads.C | 4 +- .../CentredFitSnGrad/CentredFitSnGradData.C | 4 +- .../snGradSchemes/snGradScheme/snGradScheme.C | 2 +- .../fvMatrices/fvMatrix/fvMatrix.C | 4 +- .../fvMatrices/fvMatrix/fvMatrix.H | 2 +- .../solvers/MULES/CMULESTemplates.C | 8 +-- .../fvMatrices/solvers/MULES/MULESTemplates.C | 10 +-- .../extendedCellToFaceStencilTemplates.C | 2 +- ...extendedUpwindCellToFaceStencilTemplates.C | 2 +- src/finiteVolume/fvMesh/fvMesh.C | 2 +- src/finiteVolume/fvMesh/fvMeshGeometry.C | 2 +- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 6 +- .../singleCellFvMeshInterpolate.C | 2 +- .../wallDist/nearWallDist/nearWallDist.C | 2 +- .../wallDist/nearWallDist/nearWallDist.H | 6 +- .../nearWallDist/nearWallDistNoSearch.C | 4 +- .../nearWallDist/nearWallDistNoSearch.H | 4 +- .../advectionDiffusionPatchDistMethod.C | 2 +- .../meshWave/meshWavePatchDistMethod.C | 6 +- .../meshWave/wallDistData/wallDistData.C | 4 +- .../fvMesh/wallDist/wallDist/wallDist.C | 2 +- .../LimitedScheme/LimitedScheme.C | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 2 +- .../limitedSurfaceInterpolationScheme.C | 2 +- .../schemes/CentredFitScheme/CentredFitData.C | 2 +- .../schemes/UpwindFitScheme/UpwindFitData.C | 2 +- .../schemes/clippedLinear/clippedLinear.H | 2 +- .../schemes/cubic/cubic.H | 2 +- .../schemes/linearUpwind/linearUpwind.C | 2 +- .../schemes/linearUpwind/linearUpwindV.C | 2 +- .../schemes/localMax/localMax.H | 2 +- .../schemes/localMin/localMin.H | 2 +- .../schemes/midPoint/midPoint.H | 2 +- .../schemes/pointLinear/pointLinear.C | 2 +- .../schemes/reverseLinear/reverseLinear.H | 2 +- .../skewCorrected/skewCorrectionVectors.C | 2 +- .../surfaceInterpolation.C | 8 +-- .../surfaceInterpolationScheme.C | 4 +- .../pointConstraintsTemplates.C | 2 +- .../volPointInterpolate.C | 2 +- .../fvMotionSolverCore/fvMotionSolverCore.H | 2 +- .../fvMotionSolverCoreTemplates.C | 2 +- .../inverseFaceDistanceDiffusivity.C | 2 +- .../inversePointDistanceDiffusivity.C | 2 +- .../limitTemperature/limitTemperature.C | 2 +- .../clouds/Templates/DSMCCloud/DSMCCloud.H | 16 ++--- .../clouds/Templates/DSMCCloud/DSMCCloudI.H | 16 ++--- .../FreeStream/FreeStream.C | 4 +- .../meshRefinement/meshRefinementTemplates.C | 2 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 6 +- .../fvFieldDecomposerDecomposeFields.C | 4 +- .../field/fieldMinMax/fieldMinMaxTemplates.C | 6 +- .../nearWallFields/nearWallFieldsTemplates.C | 2 +- .../functionObjects/forces/forces/forces.C | 6 +- .../utilities/dsmcFields/dsmcFields.C | 2 +- .../utilities/yPlus/yPlusTemplates.C | 10 +-- .../reactingOneDim/reactingOneDim.C | 4 +- .../regionModel/regionModel1D/regionModel1D.C | 2 +- .../kinematicSingleLayer.C | 6 +- .../kinematicSingleLayerTemplates.C | 2 +- .../thermoSingleLayer/thermoSingleLayer.C | 4 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 6 +- .../meshToMesh0/meshToMesh0Templates.C | 2 +- .../distanceSurface/distanceSurface.C | 2 +- .../sampledSurface/isoSurface/isoSurface.C | 2 +- .../isoSurface/isoSurfaceTemplates.C | 2 +- .../sampledCuttingPlane/sampledCuttingPlane.C | 2 +- .../basic/basicThermo/basicThermo.C | 6 +- .../basic/heThermo/heThermo.C | 18 ++--- .../basic/psiThermo/hePsiThermo.C | 12 ++-- .../basic/rhoThermo/heRhoThermo.C | 14 ++-- .../laminarFlameSpeed/Gulders/Gulders.C | 4 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 4 +- .../radiation/radiationModels/P1/P1.C | 2 +- .../radiationModels/viewFactor/viewFactor.C | 4 +- .../psiuReactionThermo/heheuPsiThermo.C | 28 ++++---- .../psiuReactionThermo/psiuReactionThermo.C | 4 +- .../solidThermo/solidThermo/heSolidThermo.C | 12 ++-- .../interfaceProperties/interfaceProperties.C | 6 +- .../interfaceProperties/interfaceProperties.H | 4 +- 164 files changed, 396 insertions(+), 396 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 6ca24555b..915567939 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -119,7 +119,7 @@ Foam::tmp Foam::XiEqModels::SCOPEXiEq::XiEq() const } } - volScalarField::GeometricBoundaryField& xieqBf = xieq.boundaryFieldRef(); + volScalarField::Boundary& xieqBf = xieq.boundaryFieldRef(); forAll(xieq.boundaryField(), patchi) { diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 17f92a85f..947c62132 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -266,7 +266,7 @@ Foam::tmp 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::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::laminarFlameSpeedModels::SCOPE::Ma ma[celli] = Ma(phi[celli]); } - volScalarField::GeometricBoundaryField& maBf = ma.boundaryFieldRef(); + volScalarField::Boundary& maBf = ma.boundaryFieldRef(); forAll(maBf, patchi) { diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C index 6d47b9c4c..55175d8d8 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C @@ -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(); diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H index b62ea97f6..7c8c5b6f0 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H @@ -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 K diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H index f75f4d0f5..be5356e68 100644 --- a/applications/solvers/multiphase/interFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/alphaEqn.H @@ -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 diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C index d5ee2f25f..9a1c7bc21 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C @@ -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(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H index b3006ea84..826d6658d 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.H @@ -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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index 62e2a97a3..be4def509 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -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::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) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index 89a6c281c..02b56684d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -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 K diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H index f65fdf8de..af4905abc 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H @@ -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, fluid.phases(), iter) diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index f1fed0103..5dd59dead 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -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(); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index 173e9b03c..44150c9d2 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -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 K(const phase& alpha1, const phase& alpha2) const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C index 886da7c20..a629c4637 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C @@ -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) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C index 784f323e0..edcc48fff 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C @@ -50,7 +50,7 @@ Foam::tmp 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) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C index a19b995bc..64345bf75 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -36,7 +36,7 @@ void Foam::BlendedInterfacialModel::correctFixedFluxBCs GeometricField& field ) const { - typename GeometricField::GeometricBoundaryField& fieldBf = + typename GeometricField::Boundary& fieldBf = field.boundaryFieldRef(); forAll(phase1_.phi()().boundaryField(), patchi) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index c01236eb7..ca37c2245 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -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(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index bf6d3e0d2..dca55bf87 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -91,7 +91,7 @@ class multiphaseSystem ( const phaseModel& alpha1, const phaseModel& alpha2, - surfaceVectorField::GeometricBoundaryField& nHatb + surfaceVectorField::Boundary& nHatb ) const; tmp K diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H index e078414a2..3431a1db2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H @@ -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) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H index 008134c21..3eda1b871 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H @@ -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) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C index bb9683c39..3b69aa8a6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C @@ -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) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 0853ec845..be2555958 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -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) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index d0a5b023d..9f96dd749 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -294,7 +294,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const ) ); - volScalarField::GeometricBoundaryField& bpPrime = + volScalarField::Boundary& bpPrime = tpPrime.ref().boundaryFieldRef(); forAll(bpPrime, patchi) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 0edda3819..89c6c8bbe 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -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) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index c12f25851..0864234fe 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -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 diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H index eb3eeb562..a64aeea38 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/pEqn.H @@ -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) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 8d915bc39..29a83a063 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -278,7 +278,7 @@ Foam::RASModels::kineticTheoryModel::pPrime() const ) ); - volScalarField::GeometricBoundaryField& bpPrime = + volScalarField::Boundary& bpPrime = tpPrime.ref().boundaryFieldRef(); forAll(bpPrime, patchi) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 3245dec4d..62808f99a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -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) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index a3e187e7e..dfba987a9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -36,7 +36,7 @@ void Foam::BlendedInterfacialModel::correctFixedFluxBCs GeometricField& field ) const { - typename GeometricField::GeometricBoundaryField& fieldBf = + typename GeometricField::Boundary& fieldBf = field.boundaryFieldRef(); forAll(pair_.phase1().phi().boundaryField(), patchi) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index aa860e076..bd55c9b27 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -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 diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index d44a23c6d..4450d13b3 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -291,7 +291,7 @@ void initCreatedPatches { GeoField& field = const_cast(*fieldIter()); - typename GeoField::GeometricBoundaryField& fieldBf = + typename GeoField::Boundary& fieldBf = field.boundaryFieldRef(); forAll(fieldBf, patchi) diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index 3cc479da9..285b14be6 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -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. diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C index 6a78ebad1..6f1ec3069 100644 --- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C +++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C @@ -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) { diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C index df3d89928..35161c0df 100644 --- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C +++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C @@ -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) diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C index f9d71dfe7..0db747e50 100644 --- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C +++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) ) ); - volVectorField::GeometricBoundaryField& wallGradUBf = + volVectorField::Boundary& wallGradUBf = wallGradU.boundaryFieldRef(); const fvPatchList& patches = mesh.boundary(); diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C index 9e6cc6c9d..a74df86a3 100644 --- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C +++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C @@ -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) diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C index f7189d0dc..1406016e9 100644 --- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C +++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C @@ -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) diff --git a/applications/utilities/postProcessing/wall/yPlus/yPlus.C b/applications/utilities/postProcessing/wall/yPlus/yPlus.C index 6db72440b..7b891a049 100644 --- a/applications/utilities/postProcessing/wall/yPlus/yPlus.C +++ b/applications/utilities/postProcessing/wall/yPlus/yPlus.C @@ -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(); diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C index 90cef63ba..f57a7d07b 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/createExternalCoupledPatchGeometryTemplates.C @@ -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) diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C index 29ecd0231..a8b5bb8e4 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C +++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C @@ -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; diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index 12e66bad6..422b47249 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -99,7 +99,7 @@ bool setCellFieldType } typename GeometricField:: - GeometricBoundaryField& fieldBf = field.boundaryFieldRef(); + Boundary& fieldBf = field.boundaryFieldRef(); forAll(field.boundaryField(), patchi) { @@ -277,7 +277,7 @@ bool setFaceFieldType Pstream::listCombineScatter(nChanged); typename GeometricField:: - GeometricBoundaryField& fieldBf = field.boundaryFieldRef(); + Boundary& fieldBf = field.boundaryFieldRef(); // Reassign. forAll(field.boundaryField(), patchi) diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index 0d4a4bca3..e5a9f2094 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -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; diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C index 1fcb7ec54..6265185cc 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C @@ -29,7 +29,7 @@ License #include "cyclicPolyPatch.H" template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: readField ( const DimensionedField& field, @@ -199,8 +199,8 @@ readField // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const BoundaryMesh& bmesh ) @@ -211,8 +211,8 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const BoundaryMesh& bmesh, const DimensionedField& field, @@ -244,8 +244,8 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const BoundaryMesh& bmesh, const DimensionedField& field, @@ -312,8 +312,8 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const BoundaryMesh& bmesh, const DimensionedField& field, @@ -336,12 +336,12 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const DimensionedField& field, const typename GeometricField:: - GeometricBoundaryField& btf + Boundary& btf ) : FieldField(btf.size()), @@ -360,11 +360,11 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const typename GeometricField:: - GeometricBoundaryField& btf + Boundary& btf ) : FieldField(btf), @@ -378,8 +378,8 @@ GeometricBoundaryField template class PatchField, class GeoMesh> -Foam::GeometricField::GeometricBoundaryField:: -GeometricBoundaryField +Foam::GeometricField::Boundary:: +Boundary ( const BoundaryMesh& bmesh, const DimensionedField& field, @@ -396,7 +396,7 @@ GeometricBoundaryField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: updateCoeffs() { if (debug) @@ -412,7 +412,7 @@ updateCoeffs() template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: evaluate() { if (debug) @@ -479,7 +479,7 @@ evaluate() template class PatchField, class GeoMesh> Foam::wordList -Foam::GeometricField::GeometricBoundaryField:: +Foam::GeometricField::Boundary:: types() const { const FieldField& pff = *this; @@ -496,11 +496,11 @@ types() const template class PatchField, class GeoMesh> -typename Foam::GeometricField::GeometricBoundaryField -Foam::GeometricField::GeometricBoundaryField:: +typename Foam::GeometricField::Boundary +Foam::GeometricField::Boundary:: boundaryInternalField() const { - typename GeometricField::GeometricBoundaryField + typename GeometricField::Boundary BoundaryInternalField(*this); forAll(BoundaryInternalField, patchi) @@ -515,7 +515,7 @@ boundaryInternalField() const template class PatchField, class GeoMesh> Foam::LduInterfaceFieldPtrsList -Foam::GeometricField::GeometricBoundaryField:: +Foam::GeometricField::Boundary:: interfaces() const { LduInterfaceFieldPtrsList interfaces(this->size()); @@ -541,7 +541,7 @@ interfaces() const template class PatchField, class GeoMesh> Foam::lduInterfaceFieldPtrsList -Foam::GeometricField::GeometricBoundaryField:: +Foam::GeometricField::Boundary:: scalarInterfaces() const { lduInterfaceFieldPtrsList interfaces(this->size()); @@ -566,7 +566,7 @@ scalarInterfaces() const template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::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::GeometricBoundaryField::" + "GeometricField::Boundary::" "writeEntry(const word& keyword, Ostream& os) const" ); } @@ -593,11 +593,11 @@ writeEntry(const word& keyword, Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator= ( const typename GeometricField:: - GeometricBoundaryField& bf + Boundary& bf ) { FieldField::operator=(bf); @@ -605,7 +605,7 @@ operator= template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator= ( const FieldField& ptff @@ -616,7 +616,7 @@ operator= template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator= ( const Type& t @@ -627,11 +627,11 @@ operator= template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator== ( const typename GeometricField:: - GeometricBoundaryField& bf + Boundary& bf ) { forAll((*this), patchi) @@ -642,7 +642,7 @@ operator== template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator== ( const FieldField& ptff @@ -656,7 +656,7 @@ operator== template class PatchField, class GeoMesh> -void Foam::GeometricField::GeometricBoundaryField:: +void Foam::GeometricField::Boundary:: operator== ( const Type& t @@ -676,7 +676,7 @@ Foam::Ostream& Foam::operator<< ( Ostream& os, const typename GeometricField:: - GeometricBoundaryField& bf + Boundary& bf ) { os << static_cast&>(bf); diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index 96244ccbd..be1261146 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -711,7 +711,7 @@ Foam::GeometricField::internalField() template class PatchField, class GeoMesh> typename -Foam::GeometricField::GeometricBoundaryField& +Foam::GeometricField::Boundary& Foam::GeometricField::boundaryFieldRef() { this->setUpToDate(); diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H index fbfd47553..30b095e9b 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H @@ -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 Internal; //- Type of the patch field of which the - // GeometricField::GeometricBoundaryField is composed + // GeometricField::Boundary is composed typedef PatchField Patch; - class GeometricBoundaryField + class Boundary : public FieldField { @@ -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> - 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 - void operator=(const GeometricBoundaryField&); + void operator=(const Boundary&); //- Assignment to FieldField void operator=(const FieldField&); @@ -233,7 +233,7 @@ public: //- Forced assignment to // BoundaryField - void operator==(const GeometricBoundaryField&); + void operator==(const Boundary&); //- Forced assignment to FieldField void operator==(const FieldField&); @@ -258,7 +258,7 @@ private: mutable GeometricField* 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:: - GeometricBoundaryField& + Boundary& ); diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H index da87a0012..7c93a3d72 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H @@ -67,7 +67,7 @@ Foam::GeometricField::internalField() const template class PatchField, class GeoMesh> inline const typename Foam::GeometricField:: -GeometricBoundaryField& +Boundary& Foam::GeometricField::boundaryField() const { return boundaryField_; diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H index 3cb442163..a9c849c53 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H @@ -47,7 +47,7 @@ bool reusable(const tmp>& tgf) { const GeometricField& gf = tgf(); const typename GeometricField:: - GeometricBoundaryField& gbf = gf.boundaryField(); + Boundary& gbf = gf.boundaryField(); forAll(gbf, patchi) { diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H index ca437acec..e465e00be 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H @@ -132,7 +132,7 @@ void MapGeometricFields // Map the patch fields typename GeometricField - ::GeometricBoundaryField& bfield = field.boundaryFieldRef(); + ::Boundary& bfield = field.boundaryFieldRef(); forAll(bfield, patchi) { // Cannot check sizes for patch fields because of diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H index 13f626ba6..b1d2530c2 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H @@ -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; }; diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H index 521962af0..1608e0bf5 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H @@ -72,10 +72,10 @@ Foam::geometricOneField::internalField() const } -inline Foam::geometricOneField::GeometricBoundaryField +inline Foam::geometricOneField::Boundary Foam::geometricOneField::boundaryField() const { - return GeometricBoundaryField(); + return Boundary(); } diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index 01b55287f..57ff8c1de 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -173,7 +173,7 @@ wordList mixtureKEpsilon::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::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) diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C index 02accb9a7..97effadd4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C @@ -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) { diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C index 64ca4791a..ab0830a20 100644 --- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C +++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C @@ -63,7 +63,7 @@ void Foam::ReynoldsStress::correctWallShearStress { const fvPatchList& patches = this->mesh_.boundary(); - volSymmTensorField::GeometricBoundaryField& RBf = R.boundaryFieldRef(); + volSymmTensorField::Boundary& RBf = R.boundaryFieldRef(); forAll(patches, patchi) { diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 048b3437e..b21e1de1b 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -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(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(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(this->dimensionedInternalField()); - const volScalarField::GeometricBoundaryField& bf = epsilon.boundaryField(); + const volScalarField::Boundary& bf = epsilon.boundaryField(); const epsilonWallFunctionFvPatchScalarField& epf = refCast(bf[patchi]); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 71d05b0bd..e91ec4e7b 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -76,7 +76,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster() const volScalarField& omega = static_cast(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(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(this->dimensionedInternalField()); - const volScalarField::GeometricBoundaryField& bf = omega.boundaryField(); + const volScalarField::Boundary& bf = omega.boundaryField(); const omegaWallFunctionFvPatchScalarField& opf = refCast(bf[patchi]); diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C index 0d2228d19..4e0e92ad5 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C @@ -111,7 +111,7 @@ Foam::tmp Foam::consumptionSpeed::omega0Sigma iomega0[celli] = omega0Sigma(sigma[celli], 1.0); } - volScalarField::GeometricBoundaryField& bomega0 = omega0.boundaryFieldRef(); + volScalarField::Boundary& bomega0 = omega0.boundaryFieldRef(); forAll(bomega0, patchi) { diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C index 2533334e0..4e0522923 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C @@ -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 diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C index d8058674f..42a9c0648 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C @@ -62,7 +62,7 @@ void Foam::fvMeshAdder::MapVolField // ~~~~~~~~~~~~~~~~~~~~~~~~~~ typename GeometricField:: - 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:: - GeometricBoundaryField& bfld = fld.boundaryFieldRef(); + Boundary& bfld = fld.boundaryFieldRef(); // Internal field // ~~~~~~~~~~~~~~ diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C index ad056fdea..30b43b977 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C @@ -113,7 +113,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields forAllIter(typename HashTable, flds, iter) { fldType& fld = *iter(); - typename fldType::GeometricBoundaryField& bfld = + typename fldType::Boundary& bfld = fld.boundaryFieldRef(); const FieldField& 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) diff --git a/src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.C b/src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.C index 2a8f2cf51..3f5aed900 100644 --- a/src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.C +++ b/src/dynamicMesh/fvMeshTools/fvMeshToolsTemplates.C @@ -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); diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C index 7709b5c9d..978fc3e6b 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C @@ -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::motionSmootherAlgo::curPoints() const wordList actualPatchFieldTypes; { - const pointVectorField::GeometricBoundaryField& pfld = + const pointVectorField::Boundary& pfld = displacement_.boundaryField(); actualPatchFieldTypes.setSize(pfld.size()); forAll(pfld, patchi) diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C index 683d42f75..153b71f59 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C @@ -57,7 +57,7 @@ void Foam::motionSmootherAlgo::checkConstraints } - typename FldType::GeometricBoundaryField& bFld = pf.boundaryField(); + typename FldType::Boundary& bFld = pf.boundaryField(); // Evaluate in reverse order diff --git a/src/finiteVolume/cfdTools/general/CorrectPhi/correctUphiBCs.C b/src/finiteVolume/cfdTools/general/CorrectPhi/correctUphiBCs.C index beff14e46..d486bf3ad 100644 --- a/src/finiteVolume/cfdTools/general/CorrectPhi/correctUphiBCs.C +++ b/src/finiteVolume/cfdTools/general/CorrectPhi/correctUphiBCs.C @@ -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) diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C index 8e5f2f7d8..02348e3e5 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C @@ -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) { diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C index 761e7b742..93fe6728b 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C @@ -399,7 +399,7 @@ void Foam::MRFZoneList::correctBoundaryFlux ); - surfaceScalarField::GeometricBoundaryField& phibf = phi.boundaryFieldRef(); + surfaceScalarField::Boundary& phibf = phi.boundaryFieldRef(); forAll(mesh_.boundary(), patchi) { diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C index effeed232..165dfe7b8 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C @@ -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 diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C index a48b028b5..e19d96c44 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C @@ -231,8 +231,8 @@ Foam::tmp 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) { diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C index 20aab55e3..b3171b653 100644 --- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C +++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C @@ -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) diff --git a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C index bd51322e6..8a193c030 100644 --- a/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C +++ b/src/finiteVolume/cfdTools/general/constrainHbyA/constrainHbyA.C @@ -49,7 +49,7 @@ Foam::tmp Foam::constrainHbyA } volVectorField& HbyA = tHbyANew.ref(); - volVectorField::GeometricBoundaryField& HbyAbf = HbyA.boundaryFieldRef(); + volVectorField::Boundary& HbyAbf = HbyA.boundaryFieldRef(); forAll(U.boundaryField(), patchi) { diff --git a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C index e9f1b40ec..0d79fe610 100644 --- a/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C +++ b/src/finiteVolume/cfdTools/general/constrainPressure/constrainPressure.C @@ -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) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index 421764205..bd4220b87 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -68,7 +68,7 @@ void Foam::externalCoupledMixedFvPatchField::setMaster volFieldType& vf = const_cast(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::startWait() const const volFieldType& cvf = static_cast(this->dimensionedInternalField()); - const typename volFieldType::GeometricBoundaryField& bf = + const typename volFieldType::Boundary& bf = cvf.boundaryField(); forAll(coupledPatchIDs_, i) @@ -408,7 +408,7 @@ void Foam::externalCoupledMixedFvPatchField::writeData const volFieldType& cvf = static_cast(this->dimensionedInternalField()); - const typename volFieldType::GeometricBoundaryField& bf = + const typename volFieldType::Boundary& bf = cvf.boundaryField(); forAll(coupledPatchIDs_, i) @@ -612,7 +612,7 @@ void Foam::externalCoupledMixedFvPatchField::initialise volFieldType& vf = const_cast(cvf); - typename volFieldType::GeometricBoundaryField& bf = vf.boundaryFieldRef(); + typename volFieldType::Boundary& bf = vf.boundaryFieldRef(); // identify all coupled patches DynamicList