From 2f4dd4fe27348dd8b46f1e1a604e33cc17f9ea79 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 2 Dec 2022 22:04:45 +0000 Subject: [PATCH] Code simplification: GeometricField -> VolField Using the VolField partial specialisation of GeometricField simplifies the code and improves readability. --- .../rhoCentralFoam/directionInterpolate.H | 2 +- .../adjointShapeOptimisationFoam.C | 2 +- applications/test/volField/Test-volField.C | 2 +- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 4 +- .../mesh/manipulation/subsetMesh/subsetMesh.C | 4 +- .../decomposePar/fvFieldDecomposer.H | 4 +- .../fvFieldDecomposerDecomposeFields.C | 10 +- .../reconstructPar/fvFieldReconstructor.H | 6 +- .../fvFieldReconstructorReconstructFields.C | 14 +- .../foamToEnsight/ensightField.C | 10 +- .../ensightOutputFunctions.C | 2 +- .../foamToTecplot360/tecplotWriter.H | 2 +- .../foamToTecplot360/tecplotWriterTemplates.C | 2 +- .../foamToVTK/foamToVTK/internalWriter.H | 4 +- .../foamToVTK/internalWriterTemplates.C | 4 +- .../foamToVTK/foamToVTK/patchWriter.H | 4 +- .../foamToVTK/patchWriterTemplates.C | 8 +- .../foamToVTK/foamToVTK/vtkWriteFieldOps.H | 4 +- .../foamToVTK/vtkWriteFieldOpsTemplates.C | 4 +- .../graphics/PVReaders/vtkPVFoam/vtkPVFoam.H | 10 +- .../vtkPVFoam/vtkPVFoamPointFields.H | 8 +- .../vtkPVFoam/vtkPVFoamSurfaceField.H | 2 +- .../PVReaders/vtkPVFoam/vtkPVFoamVolFields.H | 14 +- .../preProcessing/mapFields/meshToMesh0.H | 26 ++-- .../mapFields/meshToMesh0Templates.C | 30 ++-- .../mapFieldsPar/mapGeometricFields.C | 4 +- .../preProcessing/setFields/setFields.C | 2 +- src/conversion/ensight/part/ensightParts.H | 4 +- .../ensight/part/ensightPartsTemplates.C | 4 +- src/dynamicMesh/fvMeshAdder/fvMeshAdder.H | 4 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 22 +-- src/dynamicMesh/fvMeshSubset/fvMeshSubset.H | 8 +- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 12 +- .../general/fvConstraints/fvConstraints.H | 2 +- .../fvConstraints/fvConstraintsTemplates.C | 4 +- .../cfdTools/general/fvModels/fvModel.H | 28 ++-- .../general/fvModels/fvModelTemplates.C | 28 ++-- .../cfdTools/general/fvModels/fvModels.H | 24 +-- .../general/fvModels/fvModelsTemplates.C | 24 +-- .../cfdTools/general/levelSet/levelSet.H | 6 +- .../general/levelSet/levelSetTemplates.C | 10 +- .../constraint/cyclic/cyclicFvPatchField.C | 4 +- .../derived/advective/advectiveFvPatchField.C | 4 +- .../outletMappedUniformInletFvPatchField.C | 6 +- src/finiteVolume/fields/volFields/volFields.C | 8 +- src/finiteVolume/fields/volFields/volFields.H | 10 +- .../fields/volFields/volFieldsFwd.H | 13 +- .../boundedConvectionScheme.C | 10 +- .../boundedConvectionScheme.H | 10 +- .../convectionScheme/convectionScheme.H | 10 +- .../gaussConvectionScheme.C | 12 +- .../gaussConvectionScheme.H | 10 +- .../multivariateGaussConvectionScheme.C | 10 +- .../multivariateGaussConvectionScheme.H | 10 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.C | 24 +-- .../EulerD2dt2Scheme/EulerD2dt2Scheme.H | 16 +- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H | 16 +- .../steadyStateD2dt2Scheme.C | 20 +-- .../steadyStateD2dt2Scheme.H | 16 +- .../CoEulerDdtScheme/CoEulerDdtScheme.C | 82 +++++------ .../CoEulerDdtScheme/CoEulerDdtScheme.H | 40 ++--- .../CrankNicolsonDdtScheme.C | 122 ++++++++-------- .../CrankNicolsonDdtScheme.H | 40 ++--- .../EulerDdtScheme/EulerDdtScheme.C | 64 ++++---- .../EulerDdtScheme/EulerDdtScheme.H | 40 ++--- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 82 +++++------ .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H | 40 ++--- .../backwardDdtScheme/backwardDdtScheme.C | 86 +++++------ .../backwardDdtScheme/backwardDdtScheme.H | 40 ++--- .../boundedDdtScheme/boundedDdtScheme.C | 38 ++--- .../boundedDdtScheme/boundedDdtScheme.H | 40 ++--- .../ddtSchemes/ddtScheme/ddtScheme.C | 18 +-- .../ddtSchemes/ddtScheme/ddtScheme.H | 46 +++--- .../localEulerDdtScheme/localEulerDdtScheme.C | 64 ++++---- .../localEulerDdtScheme/localEulerDdtScheme.H | 42 +++--- .../steadyStateDdtScheme.C | 48 +++--- .../steadyStateDdtScheme.H | 40 ++--- .../divSchemes/divScheme/divScheme.H | 4 +- .../gaussDivScheme/gaussDivScheme.C | 4 +- .../gaussDivScheme/gaussDivScheme.H | 4 +- .../finiteVolume/fvc/fvcAverage.C | 24 +-- .../finiteVolume/fvc/fvcAverage.H | 12 +- .../finiteVolume/fvc/fvcCellReduce.C | 2 +- .../finiteVolume/fvc/fvcCellReduce.H | 4 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.C | 16 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.H | 10 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C | 8 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H | 10 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.C | 14 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.H | 10 +- src/finiteVolume/finiteVolume/fvc/fvcDdt.C | 46 +++--- src/finiteVolume/finiteVolume/fvc/fvcDdt.H | 46 +++--- src/finiteVolume/finiteVolume/fvc/fvcDiv.C | 64 ++++---- src/finiteVolume/finiteVolume/fvc/fvcDiv.H | 44 +++--- src/finiteVolume/finiteVolume/fvc/fvcFlux.H | 20 +-- .../finiteVolume/fvc/fvcFluxTemplates.C | 18 +-- src/finiteVolume/finiteVolume/fvc/fvcGrad.C | 12 +- src/finiteVolume/finiteVolume/fvc/fvcGrad.H | 8 +- .../finiteVolume/fvc/fvcLaplacian.C | 138 +++++++++--------- .../finiteVolume/fvc/fvcLaplacian.H | 114 +++++++-------- .../finiteVolume/fvc/fvcMagSqrGradGrad.C | 6 +- .../finiteVolume/fvc/fvcMagSqrGradGrad.H | 6 +- .../finiteVolume/fvc/fvcReconstruct.C | 6 +- .../finiteVolume/fvc/fvcSimpleReconstruct.C | 6 +- src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C | 8 +- src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H | 8 +- src/finiteVolume/finiteVolume/fvc/fvcSup.C | 34 ++--- src/finiteVolume/finiteVolume/fvc/fvcSup.H | 34 ++--- .../finiteVolume/fvc/fvcSurfaceIntegrate.C | 24 +-- .../finiteVolume/fvc/fvcSurfaceIntegrate.H | 8 +- .../finiteVolume/fvc/fvcVolumeIntegrate.C | 10 +- .../finiteVolume/fvc/fvcVolumeIntegrate.H | 10 +- src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C | 6 +- src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H | 6 +- src/finiteVolume/finiteVolume/fvm/fvmDdt.C | 16 +- src/finiteVolume/finiteVolume/fvm/fvmDdt.H | 16 +- src/finiteVolume/finiteVolume/fvm/fvmDiv.C | 8 +- src/finiteVolume/finiteVolume/fvm/fvmDiv.H | 8 +- .../finiteVolume/fvm/fvmLaplacian.C | 52 +++---- .../finiteVolume/fvm/fvmLaplacian.H | 52 +++---- src/finiteVolume/finiteVolume/fvm/fvmSup.C | 32 ++-- src/finiteVolume/finiteVolume/fvm/fvmSup.H | 30 ++-- .../LeastSquaresGrad/LeastSquaresGrad.C | 10 +- .../LeastSquaresGrad/LeastSquaresGrad.H | 4 +- .../gradSchemes/fourthGrad/fourthGrad.C | 14 +- .../gradSchemes/fourthGrad/fourthGrad.H | 4 +- .../gradSchemes/gaussGrad/gaussGrad.C | 14 +- .../gradSchemes/gaussGrad/gaussGrad.H | 4 +- .../gradSchemes/gradScheme/gradScheme.C | 6 +- .../gradSchemes/gradScheme/gradScheme.H | 10 +- .../leastSquaresGrad/leastSquaresGrad.C | 10 +- .../leastSquaresGrad/leastSquaresGrad.H | 4 +- .../cellLimitedGrad/cellLimitedGrad.C | 6 +- .../cellLimitedGrad/cellLimitedGrad.H | 4 +- .../cellMDLimitedGrad/cellMDLimitedGrad.H | 4 +- .../faceLimitedGrad/faceLimitedGrad.H | 4 +- .../faceMDLimitedGrad/faceMDLimitedGrad.H | 4 +- .../gaussLaplacianScheme.C | 18 +-- .../gaussLaplacianScheme.H | 20 +-- .../gaussLaplacianSchemes.C | 6 +- .../laplacianScheme/laplacianScheme.C | 12 +- .../laplacianScheme/laplacianScheme.H | 22 +-- .../CentredFitSnGrad/CentredFitSnGradScheme.H | 4 +- .../correctedSnGrad/correctedSnGrad.C | 4 +- .../correctedSnGrad/correctedSnGrad.H | 6 +- .../faceCorrectedSnGrad/faceCorrectedSnGrad.C | 4 +- .../faceCorrectedSnGrad/faceCorrectedSnGrad.H | 6 +- .../limitedSnGrad/limitedSnGrad.C | 4 +- .../limitedSnGrad/limitedSnGrad.H | 4 +- .../orthogonalSnGrad/orthogonalSnGrad.C | 2 +- .../orthogonalSnGrad/orthogonalSnGrad.H | 4 +- .../phaseStabilisedSnGrad.C | 4 +- .../phaseStabilisedSnGrad.H | 4 +- .../snGradSchemes/snGradScheme/snGradScheme.C | 8 +- .../snGradSchemes/snGradScheme/snGradScheme.H | 12 +- .../uncorrectedSnGrad/uncorrectedSnGrad.C | 2 +- .../uncorrectedSnGrad/uncorrectedSnGrad.H | 4 +- .../fvMatrices/fvMatrix/fvMatrix.C | 64 ++++---- .../fvMatrices/fvMatrix/fvMatrix.H | 70 ++++----- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 8 +- .../fvScalarMatrix/fvScalarMatrix.C | 10 +- .../cellToCell/extendedCellToCellStencil.H | 2 +- .../extendedCellToCellStencilTemplates.C | 2 +- .../extendedCentredCellToCellStencil.H | 4 +- .../cellToFace/extendedCellToFaceStencil.H | 8 +- .../extendedCellToFaceStencilTemplates.C | 4 +- .../extendedCentredCellToFaceStencil.H | 8 +- .../extendedUpwindCellToFaceStencil.H | 2 +- ...extendedUpwindCellToFaceStencilTemplates.C | 2 +- .../extendedCentredFaceToCellStencil.H | 2 +- .../faceToCell/extendedFaceToCellStencil.H | 2 +- .../extendedFaceToCellStencilTemplates.C | 6 +- .../singleCellFvMesh/singleCellFvMesh.H | 4 +- .../singleCellFvMeshInterpolate.C | 12 +- .../fvMeshToFvMesh/fvMeshToFvMesh.H | 8 +- .../fvMeshToFvMesh/fvMeshToFvMeshTemplates.C | 8 +- .../interpolation/interpolation.C | 6 +- .../interpolation/interpolation.H | 12 +- .../interpolationCell/interpolationCell.C | 4 +- .../interpolationCell/interpolationCell.H | 4 +- .../interpolationCellPatchConstrained.C | 4 +- .../interpolationCellPatchConstrained.H | 4 +- .../interpolationCellPoint.C | 4 +- .../interpolationCellPoint.H | 4 +- .../interpolationCellPointFace.C | 2 +- .../interpolationCellPointFace.H | 2 +- .../interpolationCellPointWallModified.C | 4 +- .../interpolationCellPointWallModified.H | 4 +- .../interpolationPointMVC.C | 2 +- .../interpolationPointMVC.H | 2 +- .../interpolationVolPointInterpolation.C | 4 +- .../interpolationVolPointInterpolation.H | 4 +- .../blendedSchemeBase/blendedSchemeBase.H | 4 +- .../limitedSchemes/LimitedScheme/LimitFuncs.C | 6 +- .../limitedSchemes/LimitedScheme/LimitFuncs.H | 8 +- .../LimitedScheme/LimitedScheme.C | 19 +-- .../LimitedScheme/LimitedScheme.H | 4 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 4 +- .../limitedSchemes/PhiScheme/PhiScheme.H | 2 +- .../limitedSchemes/blended/blended.H | 6 +- .../limitedSchemes/limitWith/limitWith.H | 4 +- .../limitedSurfaceInterpolationScheme.C | 8 +- .../limitedSurfaceInterpolationScheme.H | 8 +- .../limitedSchemes/upwind/upwind.H | 4 +- .../multivariateIndependentScheme.H | 4 +- .../multivariateScheme/multivariateScheme.H | 8 +- .../multivariateSelectionScheme.H | 8 +- .../multivariateSurfaceInterpolationScheme.H | 12 +- .../upwind/multivariateUpwind.H | 8 +- .../CentredFitScheme/CentredFitScheme.H | 2 +- .../schemes/CoBlended/CoBlended.H | 8 +- .../surfaceInterpolation/schemes/LUST/LUST.H | 4 +- .../PureUpwindFitScheme/PureUpwindFitScheme.H | 2 +- .../schemes/UpwindFitScheme/UpwindFitScheme.H | 2 +- .../schemes/cellCoBlended/cellCoBlended.H | 8 +- .../schemes/clippedLinear/clippedLinear.H | 2 +- .../schemes/cubic/cubic.H | 2 +- .../schemes/deferred/deferred.H | 2 +- .../schemes/downwind/downwind.H | 2 +- .../schemes/fixedBlended/fixedBlended.H | 6 +- .../schemes/harmonic/harmonic.H | 4 +- .../schemes/limiterBlended/limiterBlended.H | 6 +- .../schemes/linear/linear.H | 6 +- .../schemes/linearUpwind/linearUpwind.H | 2 +- .../linearUpwind/linearUpwindTemplates.C | 2 +- .../schemes/linearUpwind/linearUpwindV.H | 2 +- .../linearUpwind/linearUpwindVTemplates.C | 2 +- .../schemes/localBlended/localBlended.H | 8 +- .../schemes/localMax/localMax.H | 4 +- .../schemes/localMin/localMin.H | 4 +- .../schemes/midPoint/midPoint.H | 4 +- .../outletStabilised/outletStabilised.C | 4 +- .../outletStabilised/outletStabilised.H | 4 +- .../schemes/phaseStabilised/phaseStabilised.H | 4 +- .../phaseStabilisedTemplates.C | 4 +- .../schemes/pointLinear/pointLinear.C | 2 +- .../schemes/pointLinear/pointLinear.H | 2 +- .../schemes/reverseLinear/reverseLinear.H | 2 +- .../schemes/skewCorrected/skewCorrected.H | 6 +- .../schemes/weighted/weighted.H | 4 +- .../surfaceInterpolation/surfaceInterpolate.C | 36 ++--- .../surfaceInterpolation/surfaceInterpolate.H | 24 +-- .../surfaceInterpolationScheme.C | 14 +- .../surfaceInterpolationScheme.H | 20 +-- .../surfaceInterpolationSchemes.C | 4 +- .../volPointInterpolate.C | 24 +-- .../volPointInterpolation.H | 10 +- .../volPointInterpolationTemplates.C | 16 +- src/fvConstraints/limitMag/limitMag.C | 4 +- src/fvConstraints/limitMag/limitMag.H | 2 +- .../meshToMesh/MeshToMeshMapGeometricFields.H | 22 +-- .../phaseLimitStabilisation.C | 2 +- .../semiImplicitSource/semiImplicitSource.C | 4 +- .../AveragingMethod/AveragingMethod.C | 4 +- .../MPPIC/AveragingMethods/Basic/Basic.C | 2 +- src/sampling/probes/patchProbes.H | 4 +- src/sampling/probes/patchProbesTemplates.C | 10 +- src/sampling/probes/probes.H | 4 +- src/sampling/probes/probesTemplates.C | 10 +- .../sampledIsoSurfaceSurface.H | 2 +- .../sampledIsoSurfaceSurfaceTemplates.C | 2 +- .../sampledPatch/sampledPatch.H | 2 +- .../sampledPatch/sampledPatchTemplates.C | 2 +- .../sampledPatchInternalField.H | 2 +- .../sampledPatchInternalFieldTemplates.C | 2 +- .../sampledThresholdCellFaces.H | 2 +- .../sampledThresholdCellFacesTemplates.C | 2 +- .../sampledTriSurfaceMesh.H | 4 +- .../sampledTriSurfaceMeshTemplates.C | 4 +- .../surfaceFilm/surfaceFilmTemplates.C | 2 +- .../interfaceCompression/MPLIC/MPLIC.C | 2 +- .../interfaceCompression/MPLIC/MPLIC.H | 4 +- .../interfaceCompression/MPLIC/MPLICU.C | 2 +- .../interfaceCompression/MPLIC/MPLICU.H | 4 +- 274 files changed, 1796 insertions(+), 1802 deletions(-) diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H index dc81aeda82..058258ba95 100644 --- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H +++ b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H @@ -5,7 +5,7 @@ namespace Foam template tmp> interpolate ( - const GeometricField& vf, + const VolField& vf, const surfaceScalarField& dir, const word& reconFieldName = word::null ) diff --git a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C index 2b678f246b..870ff729df 100644 --- a/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C @@ -56,7 +56,7 @@ Description template void zeroCells ( - GeometricField& vf, + VolField& vf, const labelList& cells ) { diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C index 91c0f0dfc8..af8ff9c307 100644 --- a/applications/test/volField/Test-volField.C +++ b/applications/test/volField/Test-volField.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) #include "createPhi.H" - GeometricField st + VolField st ( IOobject ( diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index 9e2a0f8cb7..a196c4be92 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -129,7 +129,7 @@ void subsetVolFields const label patchi, const Type& exposedValue, const word GeomVolType, - PtrList>& subFields + PtrList>& subFields ) { const fvMesh& baseMesh = subsetter.baseMesh(); @@ -144,7 +144,7 @@ void subsetVolFields Info<< "Subsetting field " << fieldName << endl; - GeometricField volField + VolField volField ( *iter(), baseMesh diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C index 0bab9a1f28..aaf42ba9d9 100644 --- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C +++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C @@ -52,7 +52,7 @@ void subsetVolFields ( const fvMeshSubset& subsetter, const wordList& fieldNames, - PtrList>& subFields + PtrList>& subFields ) { const fvMesh& baseMesh = subsetter.baseMesh(); @@ -63,7 +63,7 @@ void subsetVolFields Info<< "Subsetting field " << fieldName << endl; - GeometricField fld + VolField fld ( IOobject ( diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H index 84d643573b..fe9dc25f39 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H @@ -146,10 +146,10 @@ public: //- Decompose volume field template - tmp> + tmp> decomposeField ( - const GeometricField& field + const VolField& field ) const; //- Decompose surface field diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C index 56426d992d..5419967ff3 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C @@ -86,7 +86,7 @@ template Foam::tmp> Foam::fvFieldDecomposer::decomposeField ( - const GeometricField& field + const VolField& field ) const { // Create dummy patch fields @@ -106,9 +106,9 @@ Foam::fvFieldDecomposer::decomposeField } // Create the processor field with the dummy patch fields - tmp> tresF + tmp> tresF ( - new GeometricField + new VolField ( IOobject ( @@ -125,11 +125,11 @@ Foam::fvFieldDecomposer::decomposeField patchFields ) ); - GeometricField& resF = tresF.ref(); + VolField& resF = tresF.ref(); // Change the patch fields to the correct type using a mapper constructor // (with reference to the now correct internal field) - typename GeometricField:: + typename VolField:: Boundary& bf = resF.boundaryFieldRef(); forAll(bf, procPatchi) { diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H index e0b98a3665..436a92fef5 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H +++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H @@ -152,16 +152,16 @@ public: //- Reconstruct volume field template - tmp> + tmp> reconstructFvVolumeField ( const IOobject& fieldIoObject, - const PtrList>& + const PtrList>& ) const; //- Read and reconstruct volume field template - tmp> + tmp> reconstructFvVolumeField(const IOobject& fieldIoObject) const; diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C index 979274dfa6..8cf2eb4774 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C +++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C @@ -142,7 +142,7 @@ Foam::tmp> Foam::fvFieldReconstructor::reconstructFvVolumeField ( const IOobject& fieldIoObject, - const PtrList>& procFields + const PtrList>& procFields ) const { // Create the internalField @@ -153,7 +153,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField forAll(procFields, proci) { - const GeometricField& procField = + const VolField& procField = procFields[proci]; // Set the cell values in the reconstructed field @@ -240,9 +240,9 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField } // Construct and return the field - return tmp> + return tmp> ( - new GeometricField + new VolField ( fieldIoObject, completeMesh_, @@ -261,7 +261,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField const IOobject& fieldIoObject ) const { - PtrList> + PtrList> procFields(procMeshes_.size()); forAll(procMeshes_, proci) @@ -269,7 +269,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField procFields.set ( proci, - new GeometricField + new VolField ( IOobject ( @@ -507,7 +507,7 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeFields ) { const word& fieldClassName = - GeometricField::typeName; + VolField::typeName; IOobjectList fields = objects.lookupClass(fieldClassName); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C index 2fd6b23fcb..d77a31051a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C @@ -40,16 +40,16 @@ using namespace Foam; // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // template -tmp> +tmp> volField ( const fvMeshSubset& meshSubsetter, - const GeometricField& vf + const VolField& vf ) { if (meshSubsetter.hasSubMesh()) { - tmp> tfld + tmp> tfld ( meshSubsetter.interpolate(vf) ); @@ -300,7 +300,7 @@ void writePatchField template void ensightField ( - const GeometricField& vf, + const VolField& vf, const ensightMesh& eMesh, const fileName& postProcPath, const word& prepend, @@ -717,7 +717,7 @@ void ensightPointField template void ensightField ( - const GeometricField& vf, + const VolField& vf, const ensightMesh& eMesh, const fileName& postProcPath, const word& prepend, diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C index 09a35f4c55..ceeb690c96 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C @@ -229,7 +229,7 @@ void Foam::ensightVolField partsList.writeField ( os, - GeometricField + VolField ( fieldObject, mesh diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H index 6188b4f9b7..2e4234f2c6 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H @@ -123,7 +123,7 @@ public: tmp> getPatchField ( const bool nearCellValue, - const GeometricField& vfld, + const VolField& vfld, const label patchi ) const; diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C index 7933eb1ef1..e3c7dd7e17 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C @@ -68,7 +68,7 @@ template Foam::tmp> Foam::tecplotWriter::getPatchField ( const bool nearCellValue, - const GeometricField& vfld, + const VolField& vfld, const label patchi ) const { diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H index aeb5956552..41967fb23b 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ public: void write ( const volPointInterpolation&, - const UPtrList>& + const UPtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C index 72bbc1e63f..7738ce4b1f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ template void Foam::internalWriter::write ( const volPointInterpolation& pInterp, - const UPtrList>& flds + const UPtrList>& flds ) { forAll(flds, i) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H index e1ba9e8ad9..feb08c91d5 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H @@ -114,7 +114,7 @@ public: template void write ( - const UPtrList>& + const UPtrList>& ); //- Write pointFields @@ -132,7 +132,7 @@ public: void write ( const PrimitivePatchInterpolation&, - const UPtrList>& + const UPtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C index 2c9f9b7878..acd583e52f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C @@ -31,12 +31,12 @@ License template void Foam::patchWriter::write ( - const UPtrList>& flds + const UPtrList>& flds ) { forAll(flds, fieldi) { - const GeometricField& fld = flds[fieldi]; + const VolField& fld = flds[fieldi]; os_ << fld.name() << ' ' << pTraits::nComponents << ' ' << nFaces_ << " float" << std::endl; @@ -96,12 +96,12 @@ template void Foam::patchWriter::write ( const PrimitivePatchInterpolation& pInter, - const UPtrList>& flds + const UPtrList>& flds ) { forAll(flds, fieldi) { - const GeometricField& fld = flds[fieldi]; + const VolField& fld = flds[fieldi]; os_ << fld.name() << ' ' << pTraits::nComponents << ' ' << nPoints_ << " float" << std::endl; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H index 97448d2a18..aa78cf6fe8 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H @@ -79,7 +79,7 @@ namespace vtkWriteOps ( std::ostream&, const bool binary, - const GeometricField&, + const VolField&, const PointField&, const vtkMesh& ); @@ -101,7 +101,7 @@ namespace vtkWriteOps std::ostream&, const bool binary, const volPointInterpolation&, - const PtrList>&, + const PtrList>&, const vtkMesh& ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C index 5206a212ac..26b7c530c9 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C @@ -97,7 +97,7 @@ void Foam::vtkWriteOps::write ( std::ostream& os, const bool binary, - const GeometricField& vvf, + const VolField& vvf, const PointField& pvf, const vtkMesh& vMesh ) @@ -147,7 +147,7 @@ void Foam::vtkWriteOps::write std::ostream& os, const bool binary, const volPointInterpolation& pInterp, - const PtrList>& flds, + const PtrList>& flds, const vtkMesh& vMesh ) { diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H index 21115084c0..e0453478c7 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H @@ -534,7 +534,7 @@ class vtkPVFoam template void convertVolFieldBlock ( - const GeometricField&, + const VolField&, autoPtr>&, vtkMultiBlockDataSet* output, const arrayRange&, @@ -545,7 +545,7 @@ class vtkPVFoam template void convertVolInternalFieldBlock ( - const typename GeometricField + const typename VolField ::Internal&, vtkMultiBlockDataSet* output, const arrayRange&, @@ -556,7 +556,7 @@ class vtkPVFoam template void convertVolInternalField ( - const typename GeometricField + const typename VolField ::Internal&, vtkMultiBlockDataSet* output, const arrayRange&, @@ -579,7 +579,7 @@ class vtkPVFoam template void convertSurfaceField ( - const GeometricField&, + const VolField&, vtkMultiBlockDataSet* output, const arrayRange&, const label datasetNo, @@ -652,7 +652,7 @@ class vtkPVFoam void convertPointField ( const PointField&, - const GeometricField&, + const VolField&, vtkMultiBlockDataSet* output, const arrayRange&, const label datasetNo, diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H index 4d835097c1..d51df62c3d 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H @@ -187,7 +187,7 @@ void Foam::vtkPVFoam::convertPointFieldBlock convertPointField ( ptf, - GeometricField::null(), + VolField::null(), output, range, datasetNo, @@ -202,7 +202,7 @@ template void Foam::vtkPVFoam::convertPointField ( const PointField& ptf, - const GeometricField& tf, + const VolField& tf, vtkMultiBlockDataSet* output, const arrayRange& range, const label datasetNo, @@ -232,7 +232,7 @@ void Foam::vtkPVFoam::convertPointField // Note: using the name of the original volField // not the name generated by the interpolation "volPointInterpolate()" - if (&tf != &GeometricField::null()) + if (&tf != &VolField::null()) { pointData->SetName(tf.name().c_str()); } @@ -285,7 +285,7 @@ void Foam::vtkPVFoam::convertPointField // continue insertion from here label i = nPoints; - if (&tf != &GeometricField::null()) + if (&tf != &VolField::null()) { forAll(addPointCellLabels, apI) { diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H index 7a793ebeff..1ba7a2dddd 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H @@ -45,7 +45,7 @@ InClass template void Foam::vtkPVFoam::convertSurfaceField ( - const GeometricField& tf, + const VolField& tf, vtkMultiBlockDataSet* output, const arrayRange& range, const label datasetNo, diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H index 58dd0b081c..487d5835db 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H @@ -59,14 +59,14 @@ void Foam::vtkPVFoam::convertVolFields if ( iter()->headerClassName() - != GeometricField::typeName + != VolField::typeName ) { continue; } // Load field - GeometricField tf + VolField tf ( *iter(), mesh @@ -282,14 +282,14 @@ void Foam::vtkPVFoam::convertVolInternalFields if ( iter()->headerClassName() - != GeometricField::Internal::typeName + != VolField::Internal::typeName ) { continue; } // Load field - typename GeometricField::Internal tf + typename VolField::Internal tf ( *iter(), mesh @@ -328,7 +328,7 @@ void Foam::vtkPVFoam::convertVolInternalFields template void Foam::vtkPVFoam::convertVolFieldBlock ( - const GeometricField& tf, + const VolField& tf, autoPtr>& ptfPtr, vtkMultiBlockDataSet* output, const arrayRange& range, @@ -370,7 +370,7 @@ void Foam::vtkPVFoam::convertVolFieldBlock template void Foam::vtkPVFoam::convertVolInternalFieldBlock ( - const typename GeometricField::Internal& tf, + const typename VolField::Internal& tf, vtkMultiBlockDataSet* output, const arrayRange& range, const List& decompLst @@ -398,7 +398,7 @@ void Foam::vtkPVFoam::convertVolInternalFieldBlock template void Foam::vtkPVFoam::convertVolInternalField ( - const typename GeometricField::Internal& tf, + const typename VolField::Internal& tf, vtkMultiBlockDataSet* output, const arrayRange& range, const label datasetNo, diff --git a/applications/utilities/preProcessing/mapFields/meshToMesh0.H b/applications/utilities/preProcessing/mapFields/meshToMesh0.H index fa985563a5..c88479e2b2 100644 --- a/applications/utilities/preProcessing/mapFields/meshToMesh0.H +++ b/applications/utilities/preProcessing/mapFields/meshToMesh0.H @@ -267,7 +267,7 @@ public: void interpolateField ( Field&, - const GeometricField&, + const VolField&, const labelList& adr, const scalarListList& weights ) const; @@ -277,7 +277,7 @@ public: void interpolateField ( Field&, - const GeometricField&, + const VolField&, const labelListList& adr, const scalarListList& weights ) const; @@ -288,7 +288,7 @@ public: void interpolateField ( Field&, - const GeometricField&, + const VolField&, const labelList& adr, const vectorField& centres )const; @@ -299,7 +299,7 @@ public: void interpolateInternalField ( Field&, - const GeometricField&, + const VolField&, order=INTERPOLATE ) const; @@ -307,7 +307,7 @@ public: void interpolateInternalField ( Field&, - const tmp>&, + const tmp>&, order=INTERPOLATE ) const; @@ -316,32 +316,32 @@ public: template void interpolate ( - GeometricField&, - const GeometricField&, + VolField&, + const VolField&, order=INTERPOLATE ) const; template void interpolate ( - GeometricField&, - const tmp>&, + VolField&, + const tmp>&, order=INTERPOLATE ) const; //- Interpolate volume field template - tmp> interpolate + tmp> interpolate ( - const GeometricField&, + const VolField&, order=INTERPOLATE ) const; template - tmp> interpolate + tmp> interpolate ( - const tmp>&, + const tmp>&, order=INTERPOLATE ) const; }; diff --git a/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C b/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C index 4c5b398503..8feb9a1b32 100644 --- a/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C +++ b/applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C @@ -57,7 +57,7 @@ template void Foam::meshToMesh0::interpolateField ( Field& toF, - const GeometricField& fromVf, + const VolField& fromVf, const labelListList& adr, const scalarListList& weights ) const @@ -83,7 +83,7 @@ template void Foam::meshToMesh0::interpolateField ( Field& toF, - const GeometricField& fromVf, + const VolField& fromVf, const labelList& adr, const scalarListList& weights ) const @@ -117,7 +117,7 @@ template void Foam::meshToMesh0::interpolateField ( Field& toF, - const GeometricField& fromVf, + const VolField& fromVf, const labelList& adr, const vectorField& centres ) const @@ -139,7 +139,7 @@ template void Foam::meshToMesh0::interpolateInternalField ( Field& toF, - const GeometricField& fromVf, + const VolField& fromVf, meshToMesh0::order ord ) const { @@ -216,7 +216,7 @@ template void Foam::meshToMesh0::interpolateInternalField ( Field& toF, - const tmp>& tfromVf, + const tmp>& tfromVf, meshToMesh0::order ord ) const { @@ -228,14 +228,14 @@ void Foam::meshToMesh0::interpolateInternalField template void Foam::meshToMesh0::interpolate ( - GeometricField& toVf, - const GeometricField& fromVf, + VolField& toVf, + const VolField& fromVf, meshToMesh0::order ord ) const { interpolateInternalField(toVf, fromVf, ord); - typename GeometricField:: + typename VolField:: Boundary& toVfBf = toVf.boundaryFieldRef(); forAll(toMesh_.boundaryMesh(), patchi) @@ -322,8 +322,8 @@ void Foam::meshToMesh0::interpolate template void Foam::meshToMesh0::interpolate ( - GeometricField& toVf, - const tmp>& tfromVf, + VolField& toVf, + const tmp>& tfromVf, meshToMesh0::order ord ) const { @@ -336,7 +336,7 @@ template Foam::tmp> Foam::meshToMesh0::interpolate ( - const GeometricField& fromVf, + const VolField& fromVf, meshToMesh0::order ord ) const { @@ -380,9 +380,9 @@ Foam::meshToMesh0::interpolate // Create the complete field from the pieces - tmp> ttoF + tmp> ttoF ( - new GeometricField + new VolField ( IOobject ( @@ -408,11 +408,11 @@ template Foam::tmp> Foam::meshToMesh0::interpolate ( - const tmp>& tfromVf, + const tmp>& tfromVf, meshToMesh0::order ord ) const { - tmp> tint = + tmp> tint = interpolate(tfromVf(), ord); tfromVf.clear(); diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C b/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C index 408aa31ee0..40cb4fd77a 100644 --- a/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C +++ b/applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C @@ -36,9 +36,9 @@ namespace Foam { template -void evaluateConstraintTypes(GeometricField& fld) +void evaluateConstraintTypes(VolField& fld) { - typename GeometricField:: + typename VolField:: Boundary& fldBf = fld.boundaryFieldRef(); if diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index 7168a3dc39..0b3e9ea4ed 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -101,7 +101,7 @@ bool setCellFieldType } } - typename GeometricField:: + typename VolField:: Boundary& fieldBf = field.boundaryFieldRef(); forAll(field.boundaryField(), patchi) diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H index 497b1d4499..b05dbbd939 100644 --- a/src/conversion/ensight/part/ensightParts.H +++ b/src/conversion/ensight/part/ensightParts.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,7 @@ public: void writeField ( ensightFile&, - const GeometricField& + const VolField& ) const; diff --git a/src/conversion/ensight/part/ensightPartsTemplates.C b/src/conversion/ensight/part/ensightPartsTemplates.C index 6b4b59410f..90303c09de 100644 --- a/src/conversion/ensight/part/ensightPartsTemplates.C +++ b/src/conversion/ensight/part/ensightPartsTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ template void Foam::ensightParts::writeField ( ensightFile& os, - const GeometricField& field + const VolField& field ) const { // find offset to patch parts (ie, the first face data) diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H index bca4b6ad30..8837f25c9b 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H @@ -86,8 +86,8 @@ class fvMeshAdder ( const mapAddedPolyMesh& meshMap, - GeometricField& fld, - const GeometricField& fldToAdd + VolField& fld, + const VolField& fldToAdd ); //- Update single surfaceField. diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C index f2c76f9858..c149e1aec2 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C @@ -36,8 +36,8 @@ void Foam::fvMeshAdder::MapVolField ( const mapAddedPolyMesh& meshMap, - GeometricField& fld, - const GeometricField& fldToAdd + VolField& fld, + const VolField& fldToAdd ) { const fvMesh& mesh = fld.mesh(); @@ -62,7 +62,7 @@ void Foam::fvMeshAdder::MapVolField // Patch fields from old mesh // ~~~~~~~~~~~~~~~~~~~~~~~~~~ - typename GeometricField:: + typename VolField:: Boundary& bfld = fld.boundaryFieldRef(); { @@ -256,37 +256,37 @@ void Foam::fvMeshAdder::MapVolFields const fvMesh& meshToAdd ) { - HashTable*> fields + HashTable*> fields ( mesh.objectRegistry::lookupClass - > + > () ); - HashTable*> fieldsToAdd + HashTable*> fieldsToAdd ( meshToAdd.objectRegistry::lookupClass - > + > () ); for ( - typename HashTable*>:: + typename HashTable*>:: iterator fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) { - GeometricField& fld = - const_cast&> + VolField& fld = + const_cast&> ( *fieldIter() ); if (fieldsToAdd.found(fld.name())) { - const GeometricField& fldToAdd = + const VolField& fldToAdd = *fieldsToAdd[fld.name()]; if (debug) diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H index 30660d85c6..fcd2472e3e 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H @@ -253,10 +253,10 @@ public: //- Map volume field template - static tmp> + static tmp> interpolate ( - const GeometricField&, + const VolField&, const fvMesh& sMesh, const labelList& patchMap, const labelList& cellMap, @@ -264,10 +264,10 @@ public: ); template - tmp> + tmp> interpolate ( - const GeometricField& + const VolField& ) const; //- Map surface field. Optionally negates value if flipping diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index e8ffc42f97..aca8a03992 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -38,7 +38,7 @@ template Foam::tmp> Foam::fvMeshSubset::interpolate ( - const GeometricField& vf, + const VolField& vf, const fvMesh& sMesh, const labelList& patchMap, const labelList& cellMap, @@ -80,9 +80,9 @@ Foam::fvMeshSubset::interpolate } } - tmp> tresF + tmp> tresF ( - new GeometricField + new VolField ( IOobject ( @@ -99,13 +99,13 @@ Foam::fvMeshSubset::interpolate patchFields ) ); - GeometricField& resF = tresF.ref(); + VolField& resF = tresF.ref(); // 2. Change the fvPatchFields to the correct type using a mapper // constructor (with reference to the now correct internal field) - typename GeometricField:: + typename VolField:: Boundary& bf = resF.boundaryFieldRef(); forAll(bf, patchi) @@ -158,7 +158,7 @@ template Foam::tmp> Foam::fvMeshSubset::interpolate ( - const GeometricField& vf + const VolField& vf ) const { return interpolate diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H index 0ffc16f9b7..f52cc98b2e 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H +++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H @@ -127,7 +127,7 @@ public: template bool constrain ( - GeometricField& field + VolField& field ) const; diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C index b862f95241..7fe571a991 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C +++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ bool Foam::fvConstraints::constrain(fvMatrix& eqn) const template bool Foam::fvConstraints::constrain ( - GeometricField& field + VolField& field ) const { const word& fieldName = field.name(); diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H index bd03cddd42..2d1fcd006f 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H @@ -113,7 +113,7 @@ protected: template tmp> source ( - const GeometricField& field, + const VolField& field, const word& fieldName, const dimensionSet& ds, const AlphaRhoFieldTypes& ... alphaRhos @@ -154,7 +154,7 @@ public: > inline static dimensionSet sourceDims ( - const GeometricField& field, + const VolField& field, const dimensionSet& ds, const AlphaRhoFieldType& alphaRho, const AlphaRhoFieldTypes& ... alphaRhos @@ -165,7 +165,7 @@ public: template inline static dimensionSet sourceDims ( - const GeometricField& field, + const VolField& field, const dimensionSet& ds ); @@ -280,14 +280,14 @@ public: template tmp> source ( - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a specified name template tmp> source ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -296,7 +296,7 @@ public: tmp> source ( const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a compressible equation with a specified name @@ -304,7 +304,7 @@ public: tmp> source ( const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -314,7 +314,7 @@ public: ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation with a specified name @@ -323,7 +323,7 @@ public: ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -333,7 +333,7 @@ public: ( const volScalarField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation @@ -342,7 +342,7 @@ public: ( const geometricOneField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation @@ -351,21 +351,21 @@ public: ( const geometricOneField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a second time derivative template tmp> d2dt2 ( - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a second time derivative template tmp> d2dt2 ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const; diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C b/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C index ef5511534b..92e6795dad 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C @@ -28,7 +28,7 @@ License template Foam::dimensionSet Foam::fvModel::sourceDims ( - const GeometricField& field, + const VolField& field, const dimensionSet& ds, const AlphaRhoFieldType& alphaRho, const AlphaRhoFieldTypes& ... alphaRhos @@ -41,7 +41,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims template Foam::dimensionSet Foam::fvModel::sourceDims ( - const GeometricField& field, + const VolField& field, const dimensionSet& ds ) { @@ -54,7 +54,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims template Foam::tmp> Foam::fvModel::source ( - const GeometricField& field, + const VolField& field, const word& fieldName, const dimensionSet& ds, const AlphaRhoFieldTypes& ... alphaRhos @@ -84,7 +84,7 @@ Foam::tmp> Foam::fvModel::source template Foam::tmp> Foam::fvModel::source ( - const GeometricField& field + const VolField& field ) const { return this->source(field, field.name()); @@ -94,7 +94,7 @@ Foam::tmp> Foam::fvModel::source template Foam::tmp> Foam::fvModel::source ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -106,7 +106,7 @@ template Foam::tmp> Foam::fvModel::source ( const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(rho, field, field.name()); @@ -117,7 +117,7 @@ template Foam::tmp> Foam::fvModel::source ( const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -130,7 +130,7 @@ Foam::tmp> Foam::fvModel::source ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(alpha, rho, field, field.name()); @@ -142,7 +142,7 @@ Foam::tmp> Foam::fvModel::source ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -155,7 +155,7 @@ Foam::tmp> Foam::fvModel::source ( const geometricOneField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(field, field.name()); @@ -167,7 +167,7 @@ Foam::tmp> Foam::fvModel::source ( const volScalarField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const { volScalarField one @@ -194,7 +194,7 @@ Foam::tmp> Foam::fvModel::source ( const geometricOneField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(rho, field, field.name()); @@ -206,7 +206,7 @@ Foam::tmp> Foam::fvModel::source template Foam::tmp> Foam::fvModel::d2dt2 ( - const GeometricField& field + const VolField& field ) const { return this->d2dt2(field, field.name()); @@ -216,7 +216,7 @@ Foam::tmp> Foam::fvModel::d2dt2 template Foam::tmp> Foam::fvModel::d2dt2 ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const { diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H index a9decb7c14..2f544e4d55 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H @@ -85,7 +85,7 @@ class fvModels template tmp> source ( - const GeometricField& field, + const VolField& field, const word& fieldName, const dimensionSet& ds, const AlphaRhoFieldTypes& ... alphaRhos @@ -144,14 +144,14 @@ public: template tmp> source ( - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a specified name template tmp> source ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -160,7 +160,7 @@ public: tmp> source ( const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a compressible equation with a specified name @@ -168,7 +168,7 @@ public: tmp> source ( const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -178,7 +178,7 @@ public: ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation with a specified name @@ -187,7 +187,7 @@ public: ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const; @@ -197,7 +197,7 @@ public: ( const volScalarField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation @@ -206,7 +206,7 @@ public: ( const geometricOneField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for a phase equation @@ -215,21 +215,21 @@ public: ( const geometricOneField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a second time derivative template tmp> d2dt2 ( - const GeometricField& field + const VolField& field ) const; //- Return source for an equation with a second time derivative template tmp> d2dt2 ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const; diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C b/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C index f0f10ff168..c97e957e2f 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C @@ -28,7 +28,7 @@ License template Foam::tmp> Foam::fvModels::source ( - const GeometricField& field, + const VolField& field, const word& fieldName, const dimensionSet& ds, const AlphaRhoFieldTypes& ... alphaRhos @@ -75,7 +75,7 @@ Foam::tmp> Foam::fvModels::source template Foam::tmp> Foam::fvModels::source ( - const GeometricField& field + const VolField& field ) const { return this->source(field, field.name()); @@ -85,7 +85,7 @@ Foam::tmp> Foam::fvModels::source template Foam::tmp> Foam::fvModels::source ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -97,7 +97,7 @@ template Foam::tmp> Foam::fvModels::source ( const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(rho, field, field.name()); @@ -108,7 +108,7 @@ template Foam::tmp> Foam::fvModels::source ( const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -121,7 +121,7 @@ Foam::tmp> Foam::fvModels::source ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(alpha, rho, field, field.name()); @@ -133,7 +133,7 @@ Foam::tmp> Foam::fvModels::source ( const volScalarField& alpha, const volScalarField& rho, - const GeometricField& field, + const VolField& field, const word& fieldName ) const { @@ -146,7 +146,7 @@ Foam::tmp> Foam::fvModels::source ( const geometricOneField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(field, field.name()); @@ -158,7 +158,7 @@ Foam::tmp> Foam::fvModels::source ( const volScalarField& alpha, const geometricOneField& rho, - const GeometricField& field + const VolField& field ) const { volScalarField one @@ -185,7 +185,7 @@ Foam::tmp> Foam::fvModels::source ( const geometricOneField& alpha, const volScalarField& rho, - const GeometricField& field + const VolField& field ) const { return this->source(rho, field, field.name()); @@ -197,7 +197,7 @@ Foam::tmp> Foam::fvModels::source template Foam::tmp> Foam::fvModels::d2dt2 ( - const GeometricField& field + const VolField& field ) const { return this->d2dt2(field, field.name()); @@ -207,7 +207,7 @@ Foam::tmp> Foam::fvModels::d2dt2 template Foam::tmp> Foam::fvModels::d2dt2 ( - const GeometricField& field, + const VolField& field, const word& fieldName ) const { diff --git a/src/finiteVolume/cfdTools/general/levelSet/levelSet.H b/src/finiteVolume/cfdTools/general/levelSet/levelSet.H index af54f03d9b..0a9a069f7a 100644 --- a/src/finiteVolume/cfdTools/general/levelSet/levelSet.H +++ b/src/finiteVolume/cfdTools/general/levelSet/levelSet.H @@ -73,13 +73,13 @@ tmp> levelSetAverage //- As the above overload, but both in cells and on patch faces template -tmp> levelSetAverage +tmp> levelSetAverage ( const volScalarField& levelC, const pointScalarField& levelP, - const GeometricField& positiveC, + const VolField& positiveC, const PointField& positiveP, - const GeometricField& negativeC, + const VolField& negativeC, const PointField& negativeP ); diff --git a/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C b/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C index 2b166fdddf..6b79e5a44b 100644 --- a/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C +++ b/src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C @@ -175,24 +175,24 @@ Foam::levelSetAverage ( const volScalarField& levelC, const pointScalarField& levelP, - const GeometricField& positiveC, + const VolField& positiveC, const PointField& positiveP, - const GeometricField& negativeC, + const VolField& negativeC, const PointField& negativeP ) { const fvMesh& mesh = levelC.mesh(); - tmp> tResult + tmp> tResult ( - GeometricField::New + VolField::New ( positiveC.name() + ":levelSetAverage", mesh, dimensioned("0", positiveC.dimensions(), Zero) ) ); - GeometricField& result = tResult.ref(); + VolField& result = tResult.ref(); result.primitiveFieldRef() = levelSetAverage diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index 91565765d8..0e70671ce5 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -135,8 +135,8 @@ template const Foam::cyclicFvPatchField& Foam::cyclicFvPatchField::nbrPatchField() const { - const GeometricField& fld = - static_cast&> + const VolField& fld = + static_cast&> ( this->primitiveField() ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 50784945db..ad07318392 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -184,9 +184,9 @@ void Foam::advectiveFvPatchField::updateCoeffs() ); scalar deltaT = this->db().time().deltaTValue(); - const GeometricField& field = + const VolField& field = this->db().objectRegistry::template - lookupObject> + lookupObject> ( this->internalField().name() ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index dc1a42c4d4..1515154dc6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,9 +98,9 @@ void Foam::outletMappedUniformInletFvPatchField::updateCoeffs() return; } - const GeometricField& f + const VolField& f ( - dynamic_cast&> + dynamic_cast&> ( this->internalField() ) diff --git a/src/finiteVolume/fields/volFields/volFields.C b/src/finiteVolume/fields/volFields/volFields.C index a2a1b0f173..87da8dbd0a 100644 --- a/src/finiteVolume/fields/volFields/volFields.C +++ b/src/finiteVolume/fields/volFields/volFields.C @@ -58,8 +58,8 @@ defineTemplateTypeNameAndDebug(volTensorField, 0); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template<> -tmp> -GeometricField::component +tmp> +VolField::component ( const direction ) const @@ -69,10 +69,10 @@ GeometricField::component template<> -void GeometricField::replace +void VolField::replace ( const direction, - const GeometricField& gsf + const VolField& gsf ) { *this == gsf; diff --git a/src/finiteVolume/fields/volFields/volFields.H b/src/finiteVolume/fields/volFields/volFields.H index aeb75f1e96..bb341bd2d7 100644 --- a/src/finiteVolume/fields/volFields/volFields.H +++ b/src/finiteVolume/fields/volFields/volFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,17 +49,17 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template<> -tmp> -GeometricField::component +tmp> +VolField::component ( const direction ) const; template<> -void GeometricField::replace +void VolField::replace ( const direction, - const GeometricField& sf + const VolField& sf ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fields/volFields/volFieldsFwd.H b/src/finiteVolume/fields/volFields/volFieldsFwd.H index 51a57fb3f2..8d712c2e5f 100644 --- a/src/finiteVolume/fields/volFields/volFieldsFwd.H +++ b/src/finiteVolume/fields/volFields/volFieldsFwd.H @@ -57,13 +57,12 @@ using VolField = GeometricField; template using VolInternalField = typename VolField::Internal; -typedef GeometricField volLabelField; -typedef GeometricField volScalarField; -typedef GeometricField volVectorField; -typedef GeometricField - volSphericalTensorField; -typedef GeometricField volSymmTensorField; -typedef GeometricField volTensorField; +typedef VolField