From cef86f598a0e588eec6db8bde5f7cc90c0126919 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 10 Nov 2023 10:20:52 +0000 Subject: [PATCH] fieldMapper: Simplification The patch-specific mapper interfaces, fvPatchFieldMapper and pointPatchFieldMapper, have been removed as they did not do anything. Patch mapping constructors and functions now take a basic fieldMapper reference. An fvPatchFieldMapper.H header has been provided to aid backwards compatability so that existing custom boundary conditions continue to compile. --- .../adjointOutletPressureFvPatchScalarField.C | 4 +- .../adjointOutletPressureFvPatchScalarField.H | 2 +- .../adjointOutletVelocityFvPatchVectorField.C | 4 +- .../adjointOutletVelocityFvPatchVectorField.H | 2 +- .../alphaOne/alphaOneFvPatchScalarField.C | 2 +- .../alphaOne/alphaOneFvPatchScalarField.H | 2 +- .../filmContactAngleFvPatchScalarField.C | 2 +- .../filmContactAngleFvPatchScalarField.H | 2 +- .../filmSurfaceVelocityFvPatchVectorField.C | 2 +- .../filmSurfaceVelocityFvPatchVectorField.H | 2 +- .../mappedFilmPressureFvPatchScalarField.C | 2 +- .../mappedFilmPressureFvPatchScalarField.H | 2 +- ...sonJacksonParticleSlipFvPatchVectorField.C | 2 +- ...sonJacksonParticleSlipFvPatchVectorField.H | 2 +- ...onJacksonParticleThetaFvPatchScalarField.C | 2 +- ...onJacksonParticleThetaFvPatchScalarField.H | 2 +- .../alphatPhaseChangeWallFunctionBase.C | 1 - ...allBoilingWallFunctionFvPatchScalarField.C | 4 +- ...allBoilingWallFunctionFvPatchScalarField.H | 8 +- ...dMultiphaseTemperatureFvPatchScalarField.C | 4 +- ...dMultiphaseTemperatureFvPatchScalarField.H | 2 +- ...aseExternalTemperatureFvPatchScalarField.C | 2 +- ...aseExternalTemperatureFvPatchScalarField.H | 2 +- .../T/smoluchowskiJumpTFvPatchScalarField.C | 6 +- .../T/smoluchowskiJumpTFvPatchScalarField.H | 8 +- .../U/maxwellSlipUFvPatchVectorField.C | 6 +- .../U/maxwellSlipUFvPatchVectorField.H | 8 +- .../mixedFixedValueSlipFvPatchField.C | 4 +- .../mixedFixedValueSlipFvPatchField.H | 8 +- .../rho/fixedRhoFvPatchScalarField.C | 4 +- .../rho/fixedRhoFvPatchScalarField.H | 2 +- ...ydrostaticDisplacementFvPatchVectorField.C | 2 +- ...ydrostaticDisplacementFvPatchVectorField.H | 2 +- .../tractionDisplacementFvPatchVectorField.C | 4 +- .../tractionDisplacementFvPatchVectorField.H | 8 +- .../decomposePar/fvFieldDecomposer.C | 2 +- .../decomposePar/fvFieldDecomposer.H | 4 +- .../decomposePar/pointFieldDecomposer.C | 6 +- .../decomposePar/pointFieldDecomposer.H | 8 +- .../reconstructPar/fvFieldReconstructor.H | 2 - .../fvFieldReconstructorTemplates.C | 15 +- .../reconstructPar/pointFieldReconstructor.H | 2 - .../pointFieldReconstructorTemplates.C | 7 +- .../preProcessing/mapFields/meshToMesh0.H | 6 +- etc/codeTemplates/BC/BC.C | 6 +- etc/codeTemplates/BC/BC.H | 8 +- .../codedFixedValueFvPatchFieldTemplate.C | 4 +- .../codedFixedValueFvPatchFieldTemplate.H | 2 +- .../codedFixedValuePointPatchFieldTemplate.C | 4 +- .../codedFixedValuePointPatchFieldTemplate.H | 2 +- .../dynamicCode/codedFvModelTemplate.C | 1 - .../codedMixedFvPatchFieldTemplate.C | 4 +- .../codedMixedFvPatchFieldTemplate.H | 2 +- ...thDissipationRateInletFvPatchScalarField.C | 4 +- ...thDissipationRateInletFvPatchScalarField.H | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 4 +- ...ngLengthFrequencyInletFvPatchScalarField.H | 2 +- .../fixedShearStressFvPatchVectorField.C | 4 +- .../fixedShearStressFvPatchVectorField.H | 2 +- .../porousBafflePressureFvPatchField.C | 2 +- .../porousBafflePressureFvPatchField.H | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../epsilonWallFunctionFvPatchScalarField.H | 2 +- .../fWallFunctionFvPatchScalarField.C | 2 +- .../fWallFunctionFvPatchScalarField.H | 2 +- .../kLowReWallFunctionFvPatchScalarField.C | 2 +- .../kLowReWallFunctionFvPatchScalarField.H | 2 +- .../kqRWallFunctionFvPatchField.C | 2 +- .../kqRWallFunctionFvPatchField.H | 2 +- .../nutLowReWallFunctionFvPatchScalarField.C | 4 +- .../nutLowReWallFunctionFvPatchScalarField.H | 2 +- .../nutURoughWallFunctionFvPatchScalarField.C | 6 +- .../nutURoughWallFunctionFvPatchScalarField.H | 8 +- ...tUSpaldingWallFunctionFvPatchScalarField.C | 4 +- ...tUSpaldingWallFunctionFvPatchScalarField.H | 2 +- .../nutUWallFunctionFvPatchScalarField.C | 4 +- .../nutUWallFunctionFvPatchScalarField.H | 2 +- .../nutWallFunctionFvPatchScalarField.C | 4 +- .../nutWallFunctionFvPatchScalarField.H | 2 +- .../nutkRoughWallFunctionFvPatchScalarField.C | 6 +- .../nutkRoughWallFunctionFvPatchScalarField.H | 8 +- .../nutkWallFunctionFvPatchScalarField.C | 4 +- .../nutkWallFunctionFvPatchScalarField.H | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../omegaWallFunctionFvPatchScalarField.H | 2 +- .../v2WallFunctionFvPatchScalarField.C | 2 +- .../v2WallFunctionFvPatchScalarField.H | 2 +- .../epsilonmWallFunctionFvPatchScalarField.C | 2 +- .../epsilonmWallFunctionFvPatchScalarField.H | 2 +- .../directFieldMapper/directFieldMapper.C | 34 ++- .../directFieldMapper/directFieldMapper.H | 46 ++-- .../fieldMappers/fieldMapper/fieldMapper.H | 5 +- .../generalFieldMapper/generalFieldMapper.C | 54 ++++- .../generalFieldMapper/generalFieldMapper.H | 19 +- .../generalFieldMapperTemplates.C | 80 ------- .../identityFieldMapper/identityFieldMapper.C | 23 ++ .../identityFieldMapper/identityFieldMapper.H | 13 +- .../reverseFieldMapper/reverseFieldMapper.C | 27 +++ .../reverseFieldMapper/reverseFieldMapper.H | 44 ++-- .../setSizeFieldMapper/setSizeFieldMapper.C | 23 +- .../setSizeFieldMapper/setSizeFieldMapper.H | 21 +- .../basicSymmetryPointPatchField.C | 4 +- .../basicSymmetryPointPatchField.H | 2 +- .../calculated/calculatedPointPatchField.C | 4 +- .../calculated/calculatedPointPatchField.H | 4 +- .../basic/coupled/coupledPointPatchField.C | 4 +- .../basic/coupled/coupledPointPatchField.H | 4 +- .../fixedValue/fixedValuePointPatchField.C | 4 +- .../fixedValue/fixedValuePointPatchField.H | 4 +- .../basic/value/valuePointPatchField.C | 6 +- .../basic/value/valuePointPatchField.H | 8 +- .../zeroGradientPointPatchField.C | 4 +- .../zeroGradientPointPatchField.H | 4 +- .../constraint/cyclic/cyclicPointPatchField.C | 4 +- .../constraint/cyclic/cyclicPointPatchField.H | 4 +- .../cyclicSlip/cyclicSlipPointPatchField.C | 4 +- .../cyclicSlip/cyclicSlipPointPatchField.H | 4 +- .../constraint/empty/emptyPointPatchField.C | 4 +- .../constraint/empty/emptyPointPatchField.H | 4 +- .../internal/internalPointPatchField.C | 4 +- .../internal/internalPointPatchField.H | 4 +- .../processor/processorPointPatchField.C | 4 +- .../processor/processorPointPatchField.H | 2 +- .../processorCyclicPointPatchField.C | 2 +- .../processorCyclicPointPatchField.H | 2 +- .../symmetry/symmetryPointPatchField.C | 4 +- .../symmetry/symmetryPointPatchField.H | 4 +- .../symmetryPlanePointPatchField.C | 4 +- .../symmetryPlanePointPatchField.H | 4 +- .../constraint/wedge/wedgePointPatchField.C | 4 +- .../constraint/wedge/wedgePointPatchField.H | 4 +- .../codedFixedValuePointPatchField.C | 4 +- .../codedFixedValuePointPatchField.H | 2 +- .../fixedNormalSlipPointPatchField.C | 4 +- .../fixedNormalSlipPointPatchField.H | 4 +- .../derived/slip/slipPointPatchField.C | 4 +- .../derived/slip/slipPointPatchField.H | 4 +- .../uniformFixedValuePointPatchField.C | 2 +- .../uniformFixedValuePointPatchField.H | 2 +- .../directPointPatchFieldMapper.H | 105 -------- .../pointPatchField/pointPatchField.C | 4 +- .../pointPatchField/pointPatchField.H | 15 +- .../pointPatchField/pointPatchFieldMapper.H | 62 +---- .../pointPatchFieldMapperFwd.H} | 31 +-- .../pointPatchField/pointPatchFieldNew.C | 2 +- .../reversePointPatchFieldMapper.H | 105 -------- .../setSizePointPatchFieldMapper.H | 77 ------ .../pointMeshMapper/pointPatchMapper.C | 4 +- .../pointMeshMapper/pointPatchMapper.H | 3 +- .../coupledTemperatureFvPatchScalarField.C | 4 +- .../coupledTemperatureFvPatchScalarField.H | 2 +- .../externalTemperatureFvPatchScalarField.C | 4 +- .../externalTemperatureFvPatchScalarField.H | 8 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 2 +- ...ayatillekeWallFunctionFvPatchScalarField.H | 2 +- .../alphatWallFunctionFvPatchScalarField.C | 2 +- .../alphatWallFunctionFvPatchScalarField.H | 2 +- ...convectiveHeatTransferFvPatchScalarField.C | 2 +- ...convectiveHeatTransferFvPatchScalarField.H | 2 +- ...oupledTemperatureMixedFvPatchScalarField.C | 2 +- ...oupledTemperatureMixedFvPatchScalarField.H | 2 +- .../thermalBaffle1DFvPatchScalarField.C | 4 +- .../thermalBaffle1DFvPatchScalarField.H | 8 +- ...RateAdvectiveDiffusiveFvPatchScalarField.C | 4 +- ...RateAdvectiveDiffusiveFvPatchScalarField.H | 8 +- .../atmBoundaryLayer/atmBoundaryLayer.C | 4 +- .../atmBoundaryLayer/atmBoundaryLayer.H | 4 +- ...ndaryLayerInletEpsilonFvPatchScalarField.C | 6 +- ...ndaryLayerInletEpsilonFvPatchScalarField.H | 8 +- ...atmBoundaryLayerInletKFvPatchScalarField.C | 6 +- ...atmBoundaryLayerInletKFvPatchScalarField.H | 8 +- ...daryLayerInletVelocityFvPatchVectorField.C | 6 +- ...daryLayerInletVelocityFvPatchVectorField.H | 8 +- ...tkAtmRoughWallFunctionFvPatchScalarField.C | 6 +- ...tkAtmRoughWallFunctionFvPatchScalarField.H | 8 +- .../fvMeshAdder/directPointPatchFieldMapper.H | 111 --------- src/dynamicMesh/fvMeshAdder/fvMeshAdder.H | 4 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 37 +-- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 11 +- ...yMotionDisplacementPointPatchVectorField.C | 2 +- ...yMotionDisplacementPointPatchVectorField.H | 2 +- src/finiteVolume/Make/files | 2 - .../MRFFreestreamVelocityFvPatchVectorField.C | 2 +- .../MRFFreestreamVelocityFvPatchVectorField.H | 2 +- .../MRFnoSlip/MRFnoSlipFvPatchVectorField.C | 2 +- .../MRFnoSlip/MRFnoSlipFvPatchVectorField.H | 2 +- .../MRFslip/MRFslipFvPatchVectorField.C | 2 +- .../MRFslip/MRFslipFvPatchVectorField.H | 2 +- .../basicSymmetry/basicSymmetryFvPatchField.C | 2 +- .../basicSymmetry/basicSymmetryFvPatchField.H | 2 +- .../basic/calculated/calculatedFvPatchField.C | 6 +- .../basic/calculated/calculatedFvPatchField.H | 4 +- .../basic/coupled/coupledFvPatchField.C | 2 +- .../basic/coupled/coupledFvPatchField.H | 4 +- .../directionMixedFvPatchField.C | 4 +- .../directionMixedFvPatchField.H | 8 +- .../extrapolatedCalculatedFvPatchField.C | 6 +- .../extrapolatedCalculatedFvPatchField.H | 4 +- .../fixedGradient/fixedGradientFvPatchField.C | 4 +- .../fixedGradient/fixedGradientFvPatchField.H | 8 +- .../basic/fixedValue/fixedValueFvPatchField.C | 2 +- .../basic/fixedValue/fixedValueFvPatchField.H | 4 +- .../basic/mixed/mixedFvPatchField.C | 4 +- .../basic/mixed/mixedFvPatchField.H | 8 +- .../basic/transform/transformFvPatchField.C | 2 +- .../basic/transform/transformFvPatchField.H | 4 +- .../zeroGradient/zeroGradientFvPatchField.C | 4 +- .../zeroGradient/zeroGradientFvPatchField.H | 4 +- .../constraint/cyclic/cyclicFvPatchField.C | 2 +- .../constraint/cyclic/cyclicFvPatchField.H | 4 +- .../cyclicSlip/cyclicSlipFvPatchField.C | 4 +- .../cyclicSlip/cyclicSlipFvPatchField.H | 4 +- .../constraint/empty/emptyFvPatchField.C | 6 +- .../constraint/empty/emptyFvPatchField.H | 8 +- .../internal/internalFvPatchField.C | 6 +- .../internal/internalFvPatchField.H | 4 +- .../jumpCyclic/jumpCyclicFvPatchField.C | 4 +- .../jumpCyclic/jumpCyclicFvPatchField.H | 4 +- .../nonConformalCyclicFvPatchField.C | 4 +- .../nonConformalCyclicFvPatchField.H | 4 +- .../nonConformalErrorFvPatchField.C | 4 +- .../nonConformalErrorFvPatchField.H | 4 +- .../nonConformalProcessorCyclicFvPatchField.C | 4 +- .../nonConformalProcessorCyclicFvPatchField.H | 2 +- .../processor/processorFvPatchField.C | 4 +- .../processor/processorFvPatchField.H | 4 +- .../processorCyclicFvPatchField.C | 4 +- .../processorCyclicFvPatchField.H | 2 +- .../symmetry/symmetryFvPatchField.C | 4 +- .../symmetry/symmetryFvPatchField.H | 4 +- .../symmetryPlane/symmetryPlaneFvPatchField.C | 4 +- .../symmetryPlane/symmetryPlaneFvPatchField.H | 4 +- .../constraint/wedge/wedgeFvPatchField.C | 4 +- .../constraint/wedge/wedgeFvPatchField.H | 4 +- .../PrghPressureFvPatchScalarField.C | 4 +- .../PrghPressureFvPatchScalarField.H | 2 +- .../activeBaffleVelocityFvPatchVectorField.C | 4 +- .../activeBaffleVelocityFvPatchVectorField.H | 8 +- ...ureForceBaffleVelocityFvPatchVectorField.C | 4 +- ...ureForceBaffleVelocityFvPatchVectorField.H | 8 +- .../derived/advective/advectiveFvPatchField.C | 4 +- .../derived/advective/advectiveFvPatchField.H | 2 +- .../codedFixedValueFvPatchField.C | 4 +- .../codedFixedValueFvPatchField.H | 2 +- .../codedMixed/codedMixedFvPatchField.C | 4 +- .../codedMixed/codedMixedFvPatchField.H | 2 +- ...lindricalInletVelocityFvPatchVectorField.C | 4 +- ...lindricalInletVelocityFvPatchVectorField.H | 2 +- .../dynamicPressureFvPatchScalarField.C | 6 +- .../dynamicPressureFvPatchScalarField.H | 8 +- .../entrainmentPressureFvPatchScalarField.C | 2 +- .../entrainmentPressureFvPatchScalarField.H | 2 +- .../externalCoupledMixedFvPatchField.C | 4 +- .../externalCoupledMixedFvPatchField.H | 2 +- .../fanPressureFvPatchScalarField.C | 2 +- .../fanPressureFvPatchScalarField.H | 2 +- .../fanPressureJumpFvPatchScalarField.C | 2 +- .../fanPressureJumpFvPatchScalarField.H | 2 +- ...uxExtrapolatedPressureFvPatchScalarField.C | 2 +- ...uxExtrapolatedPressureFvPatchScalarField.H | 2 +- .../fixedFluxPressureFvPatchScalarField.C | 4 +- .../fixedFluxPressureFvPatchScalarField.H | 2 +- .../fixedInternalValueFvPatchField.C | 2 +- .../fixedInternalValueFvPatchField.H | 2 +- .../derived/fixedJump/fixedJumpFvPatchField.C | 4 +- .../derived/fixedJump/fixedJumpFvPatchField.H | 8 +- .../derived/fixedMean/fixedMeanFvPatchField.C | 2 +- .../derived/fixedMean/fixedMeanFvPatchField.H | 2 +- .../fixedMeanOutletInletFvPatchField.C | 2 +- .../fixedMeanOutletInletFvPatchField.H | 2 +- ...malInletOutletVelocityFvPatchVectorField.C | 4 +- ...malInletOutletVelocityFvPatchVectorField.H | 8 +- .../fixedNormalSlipFvPatchField.C | 4 +- .../fixedNormalSlipFvPatchField.H | 8 +- ...ureCompressibleDensityFvPatchScalarField.C | 4 +- ...ureCompressibleDensityFvPatchScalarField.H | 2 +- .../fixedProfile/fixedProfileFvPatchField.C | 2 +- .../fixedProfile/fixedProfileFvPatchField.H | 2 +- .../fixedValueInletOutletFvPatchField.C | 2 +- .../fixedValueInletOutletFvPatchField.H | 2 +- .../flowRateInletVelocityFvPatchVectorField.C | 4 +- .../flowRateInletVelocityFvPatchVectorField.H | 8 +- ...flowRateOutletVelocityFvPatchVectorField.C | 2 +- ...flowRateOutletVelocityFvPatchVectorField.H | 2 +- .../fluxCorrectedVelocityFvPatchVectorField.C | 4 +- .../fluxCorrectedVelocityFvPatchVectorField.H | 2 +- .../freestream/freestreamFvPatchField.C | 2 +- .../freestream/freestreamFvPatchField.H | 2 +- .../freestreamPressureFvPatchScalarField.C | 2 +- .../freestreamPressureFvPatchScalarField.H | 2 +- .../freestreamVelocityFvPatchVectorField.C | 2 +- .../freestreamVelocityFvPatchVectorField.H | 2 +- .../inletOutlet/inletOutletFvPatchField.C | 2 +- .../inletOutlet/inletOutletFvPatchField.H | 4 +- ...OutletTotalTemperatureFvPatchScalarField.C | 6 +- ...OutletTotalTemperatureFvPatchScalarField.H | 8 +- .../interfaceCompressionFvPatchScalarField.C | 4 +- .../interfaceCompressionFvPatchScalarField.H | 2 +- ...erstitialInletVelocityFvPatchVectorField.C | 6 +- ...erstitialInletVelocityFvPatchVectorField.H | 8 +- ...mappedFlowRateVelocityFvPatchVectorField.C | 4 +- ...mappedFlowRateVelocityFvPatchVectorField.H | 2 +- .../mappedInternalValueFvPatchField.C | 4 +- .../mappedInternalValueFvPatchField.H | 8 +- .../mappedValue/mappedValueFvPatchField.C | 4 +- .../mappedValue/mappedValueFvPatchField.H | 8 +- .../mappedVelocityFluxFvPatchField.C | 4 +- .../mappedVelocityFluxFvPatchField.H | 2 +- ...FlowRateOutletVelocityFvPatchVectorField.C | 2 +- ...FlowRateOutletVelocityFvPatchVectorField.H | 2 +- ...movingWallSlipVelocityFvPatchVectorField.C | 4 +- ...movingWallSlipVelocityFvPatchVectorField.H | 4 +- .../movingWallVelocityFvPatchVectorField.C | 2 +- .../movingWallVelocityFvPatchVectorField.H | 2 +- .../derived/noSlip/noSlipFvPatchVectorField.C | 2 +- .../derived/noSlip/noSlipFvPatchVectorField.H | 4 +- .../outletInlet/outletInletFvPatchField.C | 2 +- .../outletInlet/outletInletFvPatchField.H | 2 +- .../outletMappedUniformInletFvPatchField.C | 2 +- .../outletMappedUniformInletFvPatchField.H | 2 +- ...utletPhaseMeanVelocityFvPatchVectorField.C | 4 +- ...utletPhaseMeanVelocityFvPatchVectorField.H | 2 +- .../partialSlip/partialSlipFvPatchField.C | 4 +- .../partialSlip/partialSlipFvPatchField.H | 8 +- ...aseHydrostaticPressureFvPatchScalarField.C | 4 +- ...aseHydrostaticPressureFvPatchScalarField.H | 2 +- .../plenumPressureFvPatchScalarField.C | 4 +- .../plenumPressureFvPatchScalarField.H | 2 +- .../pressure/pressureFvPatchScalarField.C | 6 +- .../pressure/pressureFvPatchScalarField.H | 8 +- ...tedInletOutletVelocityFvPatchVectorField.C | 6 +- ...tedInletOutletVelocityFvPatchVectorField.H | 8 +- ...eDirectedInletVelocityFvPatchVectorField.C | 6 +- ...eDirectedInletVelocityFvPatchVectorField.H | 8 +- ...tOutletParSlipVelocityFvPatchVectorField.C | 4 +- ...tOutletParSlipVelocityFvPatchVectorField.H | 2 +- ...ureInletOutletVelocityFvPatchVectorField.C | 2 +- ...ureInletOutletVelocityFvPatchVectorField.H | 2 +- ...reInletUniformVelocityFvPatchVectorField.C | 2 +- ...reInletUniformVelocityFvPatchVectorField.H | 2 +- .../pressureInletVelocityFvPatchVectorField.C | 2 +- .../pressureInletVelocityFvPatchVectorField.H | 2 +- ...malInletOutletVelocityFvPatchVectorField.C | 4 +- ...malInletOutletVelocityFvPatchVectorField.H | 2 +- ...talHydrostaticPressureFvPatchScalarField.C | 4 +- ...talHydrostaticPressureFvPatchScalarField.H | 2 +- ...ureInletOutletVelocityFvPatchVectorField.C | 2 +- ...ureInletOutletVelocityFvPatchVectorField.H | 2 +- .../rotatingTotalPressureFvPatchScalarField.C | 4 +- .../rotatingTotalPressureFvPatchScalarField.H | 2 +- .../rotatingWallVelocityFvPatchVectorField.C | 2 +- .../rotatingWallVelocityFvPatchVectorField.H | 2 +- .../derived/slip/slipFvPatchField.C | 4 +- .../derived/slip/slipFvPatchField.H | 4 +- .../supersonicFreestreamFvPatchVectorField.C | 4 +- .../supersonicFreestreamFvPatchVectorField.H | 2 +- ...urfaceNormalFixedValueFvPatchVectorField.C | 6 +- ...urfaceNormalFixedValueFvPatchVectorField.H | 8 +- ...ormalUniformFixedValueFvPatchVectorField.C | 4 +- ...ormalUniformFixedValueFvPatchVectorField.H | 2 +- ...lFlowRateInletVelocityFvPatchVectorField.C | 4 +- ...lFlowRateInletVelocityFvPatchVectorField.H | 2 +- .../swirlInletVelocityFvPatchVectorField.C | 2 +- .../swirlInletVelocityFvPatchVectorField.H | 2 +- .../syringePressureFvPatchScalarField.C | 4 +- .../syringePressureFvPatchScalarField.H | 2 +- .../timeVaryingMappedFixedValueFvPatchField.C | 4 +- .../timeVaryingMappedFixedValueFvPatchField.H | 8 +- .../timeVaryingMappedFvPatchField.C | 2 +- .../timeVaryingMappedFvPatchField.H | 2 +- .../totalPressureFvPatchScalarField.C | 2 +- .../totalPressureFvPatchScalarField.H | 2 +- .../totalTemperatureFvPatchScalarField.C | 6 +- .../totalTemperatureFvPatchScalarField.H | 8 +- ...ranslatingWallVelocityFvPatchVectorField.C | 2 +- ...ranslatingWallVelocityFvPatchVectorField.H | 2 +- ...nicEntrainmentPressureFvPatchScalarField.C | 4 +- ...nicEntrainmentPressureFvPatchScalarField.H | 8 +- .../turbulentInletFvPatchField.C | 4 +- .../turbulentInletFvPatchField.H | 8 +- ...sityKineticEnergyInletFvPatchScalarField.C | 4 +- ...sityKineticEnergyInletFvPatchScalarField.H | 2 +- ...ityHydrostaticPressureFvPatchScalarField.C | 4 +- ...ityHydrostaticPressureFvPatchScalarField.H | 2 +- .../uniformFixedGradientFvPatchField.C | 2 +- .../uniformFixedGradientFvPatchField.H | 2 +- .../uniformFixedValueFvPatchField.C | 2 +- .../uniformFixedValueFvPatchField.H | 2 +- .../uniformInletOutletFvPatchField.C | 4 +- .../uniformInletOutletFvPatchField.H | 8 +- .../uniformJump/uniformJumpFvPatchField.C | 2 +- .../uniformJump/uniformJumpFvPatchField.H | 2 +- .../uniformTotalPressureFvPatchScalarField.C | 4 +- .../uniformTotalPressureFvPatchScalarField.H | 2 +- .../variableHeightFlowRateFvPatchField.C | 4 +- .../variableHeightFlowRateFvPatchField.H | 2 +- ...tFlowRateInletVelocityFvPatchVectorField.C | 2 +- ...tFlowRateInletVelocityFvPatchVectorField.H | 2 +- .../waveSurfacePressureFvPatchScalarField.C | 4 +- .../waveSurfacePressureFvPatchScalarField.H | 2 +- .../waveTransmissiveFvPatchField.C | 4 +- .../waveTransmissiveFvPatchField.H | 2 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 6 +- .../fvPatchFields/fvPatchField/fvPatchField.H | 15 +- .../fvPatchField/fvPatchFieldMapper.H | 61 +---- .../fvPatchField/fvPatchFieldMapperFwd.H} | 33 ++- .../fvPatchField/fvPatchFieldNew.C | 2 +- .../fvPatchField/reverseFvPatchFieldMapper.H | 105 -------- .../fvPatchField/setSizeFvPatchFieldMapper.H | 77 ------ .../calculated/calculatedFvsPatchField.C | 4 +- .../calculated/calculatedFvsPatchField.H | 2 +- .../basic/coupled/coupledFvsPatchField.C | 2 +- .../basic/coupled/coupledFvsPatchField.H | 2 +- .../fixedValue/fixedValueFvsPatchField.C | 2 +- .../fixedValue/fixedValueFvsPatchField.H | 2 +- .../constraint/cyclic/cyclicFvsPatchField.C | 4 +- .../constraint/cyclic/cyclicFvsPatchField.H | 4 +- .../cyclicSlip/cyclicSlipFvsPatchField.C | 4 +- .../cyclicSlip/cyclicSlipFvsPatchField.H | 4 +- .../constraint/empty/emptyFvsPatchField.C | 6 +- .../constraint/empty/emptyFvsPatchField.H | 8 +- .../internal/internalFvsPatchField.C | 4 +- .../internal/internalFvsPatchField.H | 2 +- .../nonConformalCyclicFvsPatchField.C | 6 +- .../nonConformalCyclicFvsPatchField.H | 4 +- .../nonConformalErrorFvsPatchField.C | 4 +- .../nonConformalErrorFvsPatchField.H | 2 +- ...nonConformalProcessorCyclicFvsPatchField.C | 4 +- ...nonConformalProcessorCyclicFvsPatchField.H | 2 +- .../processor/processorFvsPatchField.C | 4 +- .../processor/processorFvsPatchField.H | 4 +- .../processorCyclicFvsPatchField.C | 4 +- .../processorCyclicFvsPatchField.H | 2 +- .../symmetry/symmetryFvsPatchField.C | 2 +- .../symmetry/symmetryFvsPatchField.H | 2 +- .../symmetryPlaneFvsPatchField.C | 2 +- .../symmetryPlaneFvsPatchField.H | 2 +- .../constraint/wedge/wedgeFvsPatchField.C | 2 +- .../constraint/wedge/wedgeFvsPatchField.H | 2 +- .../nonConformalPolyFacesFvsPatchLabelField.C | 4 +- .../nonConformalPolyFacesFvsPatchLabelField.H | 2 +- .../polyFaces/polyFacesFvsPatchLabelField.C | 4 +- .../polyFaces/polyFacesFvsPatchLabelField.H | 2 +- .../fvsPatchField/fvsPatchField.C | 6 +- .../fvsPatchField/fvsPatchField.H | 15 +- .../fvsPatchField/fvsPatchFieldNew.C | 2 +- .../fvMesh/fvMeshMapper/fvPatchMapper.H | 4 +- .../fvMeshStitcher/conformedFvsPatchField.C | 4 +- .../fvMeshStitcher/conformedFvsPatchField.H | 8 +- .../fvMeshStitcher/fvMeshStitcherTemplates.C | 5 +- .../singleCellFvMesh/singleCellFvMesh.H | 6 +- .../singleCellFvMeshInterpolate.C | 4 +- .../fvMeshToFvMesh/fvMeshToFvMeshTemplates.C | 17 +- .../patchToPatchFvPatchFieldMapper.H | 226 ------------------ .../patchToPatchFvPatchFieldMapperTemplates.C | 107 --------- .../moving/fvMeshStitchersMoving.C | 2 +- .../meshToMesh/MeshToMeshMapGeometricFields.H | 13 +- .../meshToMesh/fvMeshTopoChangersMeshToMesh.C | 7 +- .../cellMotion/cellMotionFvPatchField.C | 4 +- .../cellMotion/cellMotionFvPatchField.H | 4 +- .../surfaceSlipDisplacementFvPatchField.H | 4 +- ...llatingDisplacementPointPatchVectorField.C | 4 +- ...llatingDisplacementPointPatchVectorField.H | 9 +- ...OscillatingVelocityPointPatchVectorField.C | 4 +- ...OscillatingVelocityPointPatchVectorField.H | 9 +- ...llatingDisplacementPointPatchVectorField.C | 2 +- ...llatingDisplacementPointPatchVectorField.H | 2 +- ...oscillatingVelocityPointPatchVectorField.C | 4 +- ...oscillatingVelocityPointPatchVectorField.H | 9 +- ...surfaceDisplacementPointPatchVectorField.C | 2 +- ...surfaceDisplacementPointPatchVectorField.H | 2 +- ...aceSlipDisplacementPointPatchVectorField.C | 2 +- ...aceSlipDisplacementPointPatchVectorField.H | 2 +- ...meVaryingMappedFixedValuePointPatchField.C | 4 +- ...meVaryingMappedFixedValuePointPatchField.H | 8 +- ...polatedDisplacementPointPatchVectorField.C | 2 +- ...polatedDisplacementPointPatchVectorField.H | 2 +- .../waveDisplacementPointPatchVectorField.C | 2 +- .../waveDisplacementPointPatchVectorField.H | 2 +- .../genericPointPatchField.C | 6 +- .../genericPointPatchField.H | 8 +- .../genericFvPatchField/genericFvPatchField.C | 6 +- .../genericFvPatchField/genericFvPatchField.H | 8 +- .../PatchCollisionDensity.C | 6 +- .../zeroFixedValuePointPatchField.C | 4 +- .../zeroFixedValuePointPatchField.H | 6 +- src/meshTools/Make/files | 4 + .../nonConformalCyclicPointPatchField.C | 4 +- .../nonConformalCyclicPointPatchField.H | 4 +- .../nonConformalErrorPointPatchField.C | 4 +- .../nonConformalErrorPointPatchField.H | 4 +- ...nConformalProcessorCyclicPointPatchField.C | 2 +- ...nConformalProcessorCyclicPointPatchField.H | 2 +- .../patchToPatchFieldMapper.C} | 22 +- .../patchToPatchFieldMapper.H} | 84 ++++--- .../patchToPatchFieldMapperTemplates.C} | 26 +- .../patchToPatchLeftOverFieldMapper.C | 65 +++++ .../patchToPatchLeftOverFieldMapper.H} | 52 ++-- .../patchToPatchNormalisedFieldMapper.C} | 31 ++- .../patchToPatchNormalisedFieldMapper.H} | 73 +++--- .../alphaContactAngleFvPatchScalarField.C | 4 +- .../alphaContactAngleFvPatchScalarField.H | 2 +- .../MarshakRadiationFvPatchScalarField.C | 6 +- .../MarshakRadiationFvPatchScalarField.H | 8 +- ...iationFixedTemperatureFvPatchScalarField.C | 6 +- ...iationFixedTemperatureFvPatchScalarField.H | 8 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 6 +- ...iffusiveRadiationMixedFvPatchScalarField.H | 8 +- ...veViewFactorFixedValueFvPatchScalarField.C | 6 +- ...veViewFactorFixedValueFvPatchScalarField.H | 8 +- .../radiationCoupledBase.C | 6 +- .../radiationCoupledBase.H | 37 ++- ...iffusiveRadiationMixedFvPatchScalarField.C | 6 +- ...iffusiveRadiationMixedFvPatchScalarField.H | 8 +- ...adsorptionMassFractionFvPatchScalarField.C | 2 +- ...adsorptionMassFractionFvPatchScalarField.H | 2 +- ...ableBaffleMassFractionFvPatchScalarField.C | 4 +- ...ableBaffleMassFractionFvPatchScalarField.H | 2 +- ...ieTransferMassFractionFvPatchScalarField.C | 4 +- ...ieTransferMassFractionFvPatchScalarField.H | 8 +- ...cieTransferTemperatureFvPatchScalarField.C | 2 +- ...cieTransferTemperatureFvPatchScalarField.H | 2 +- ...specieTransferVelocityFvPatchVectorField.C | 2 +- ...specieTransferVelocityFvPatchVectorField.H | 2 +- .../energyJump/energyJumpFvPatchScalarField.C | 2 +- .../energyJump/energyJumpFvPatchScalarField.H | 2 +- .../fixedEnergyFvPatchScalarField.C | 4 +- .../fixedEnergyFvPatchScalarField.H | 4 +- ...yCalculatedTemperatureFvPatchScalarField.C | 4 +- ...yCalculatedTemperatureFvPatchScalarField.H | 8 +- .../gradientEnergyFvPatchScalarField.C | 4 +- .../gradientEnergyFvPatchScalarField.H | 4 +- ...yCalculatedTemperatureFvPatchScalarField.C | 4 +- ...yCalculatedTemperatureFvPatchScalarField.H | 8 +- .../mixedEnergyFvPatchScalarField.C | 4 +- .../mixedEnergyFvPatchScalarField.H | 4 +- .../fixedUnburntEnthalpyFvPatchScalarField.C | 4 +- .../fixedUnburntEnthalpyFvPatchScalarField.H | 4 +- ...radientUnburntEnthalpyFvPatchScalarField.C | 4 +- ...radientUnburntEnthalpyFvPatchScalarField.H | 4 +- .../mixedUnburntEnthalpyFvPatchScalarField.C | 4 +- .../mixedUnburntEnthalpyFvPatchScalarField.H | 4 +- .../contactAngleFvPatchScalarField.C | 4 +- .../contactAngleFvPatchScalarField.H | 2 +- .../alphaFixedPressureFvPatchScalarField.C | 6 +- .../alphaFixedPressureFvPatchScalarField.H | 8 +- .../waveAlpha/waveAlphaFvPatchScalarField.C | 2 +- .../waveAlpha/waveAlphaFvPatchScalarField.H | 2 +- .../waveInletOutletFvPatchField.C | 4 +- .../waveInletOutletFvPatchField.H | 2 +- .../waveVelocityFvPatchVectorField.C | 2 +- .../waveVelocityFvPatchVectorField.H | 2 +- 552 files changed, 1408 insertions(+), 2530 deletions(-) delete mode 100644 src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapperTemplates.C delete mode 100644 src/OpenFOAM/fields/pointPatchFields/pointPatchField/directPointPatchFieldMapper.H rename src/OpenFOAM/fields/{Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapperTemplates.C => pointPatchFields/pointPatchField/pointPatchFieldMapperFwd.H} (70%) delete mode 100644 src/OpenFOAM/fields/pointPatchFields/pointPatchField/reversePointPatchFieldMapper.H delete mode 100644 src/OpenFOAM/fields/pointPatchFields/pointPatchField/setSizePointPatchFieldMapper.H delete mode 100644 src/dynamicMesh/fvMeshAdder/directPointPatchFieldMapper.H rename src/{OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapperTemplates.C => finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapperFwd.H} (75%) delete mode 100644 src/finiteVolume/fields/fvPatchFields/fvPatchField/reverseFvPatchFieldMapper.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/fvPatchField/setSizeFvPatchFieldMapper.H delete mode 100644 src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.H delete mode 100644 src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapperTemplates.C rename src/{finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.C => meshTools/patchToPatchFieldMapper/patchToPatchFieldMapper.C} (78%) rename src/{OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperPatchRef.H => meshTools/patchToPatchFieldMapper/patchToPatchFieldMapper.H} (52%) rename src/{OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapperTemplates.C => meshTools/patchToPatchFieldMapper/patchToPatchFieldMapperTemplates.C} (72%) create mode 100644 src/meshTools/patchToPatchFieldMapper/patchToPatchLeftOverFieldMapper.C rename src/{finiteVolume/fields/fvPatchFields/fvPatchField/identityFvPatchFieldMapper.H => meshTools/patchToPatchFieldMapper/patchToPatchLeftOverFieldMapper.H} (55%) rename src/{OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapperTemplates.C => meshTools/patchToPatchFieldMapper/patchToPatchNormalisedFieldMapper.C} (73%) rename src/{finiteVolume/fields/fvPatchFields/fvPatchField/directFvPatchFieldMapper.H => meshTools/patchToPatchFieldMapper/patchToPatchNormalisedFieldMapper.H} (53%) diff --git a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index 0de20b2024..7e2a6f1bdc 100644 --- a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C +++ b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "adjointOutletPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -49,7 +49,7 @@ adjointOutletPressureFvPatchScalarField const adjointOutletPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper) diff --git a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H index 168e3ad60a..7bf0068d89 100644 --- a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H +++ b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H @@ -73,7 +73,7 @@ public: const adjointOutletPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C index 5c7a8393e1..a5cd2f8c10 100644 --- a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C +++ b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C @@ -26,8 +26,8 @@ License #include "adjointOutletVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" +#include "fieldMapper.H" #include "surfaceFields.H" -#include "fvPatchFieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ adjointOutletVelocityFvPatchVectorField const adjointOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper) diff --git a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H index 3bc7502365..2e8310130c 100644 --- a/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H +++ b/applications/legacy/incompressible/adjointShapeOptimisationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H @@ -73,7 +73,7 @@ public: const adjointOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C index d4edcd211c..3232db82b4 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.C @@ -58,7 +58,7 @@ Foam::alphaOneFvPatchScalarField::alphaOneFvPatchScalarField const alphaOneFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper, false) // Don't map diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.H b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.H index 024f2427d5..1f695f3e81 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.H +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/alphaOne/alphaOneFvPatchScalarField.H @@ -81,7 +81,7 @@ public: const alphaOneFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.C index c3ee3dfd8a..9a71038879 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.C +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.C @@ -45,7 +45,7 @@ Foam::filmContactAngleFvPatchScalarField::filmContactAngleFvPatchScalarField const filmContactAngleFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchScalarField(psf, p, iF, mapper), diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.H b/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.H index 71ff84be91..a75081c926 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.H +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/filmContactAngle/filmContactAngleFvPatchScalarField.H @@ -129,7 +129,7 @@ public: const filmContactAngleFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C index 8c027f0bf2..67dad90ee3 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.C @@ -66,7 +66,7 @@ filmSurfaceVelocityFvPatchVectorField const filmSurfaceVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.H b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.H index 762990dcc6..1bdfcab18f 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.H +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/filmSurfaceVelocity/filmSurfaceVelocityFvPatchVectorField.H @@ -116,7 +116,7 @@ public: const filmSurfaceVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.C b/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.C index a1f56222a9..e3abb78b2a 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.C +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.C @@ -46,7 +46,7 @@ Foam::mappedFilmPressureFvPatchScalarField::mappedFilmPressureFvPatchScalarField const mappedFilmPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchField(ptf, p, iF, mapper) diff --git a/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.H b/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.H index 5b0ebdb09c..243b1e9e55 100644 --- a/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.H +++ b/applications/modules/isothermalFilm/derivedFvPatchFields/mappedFilmPressure/mappedFilmPressureFvPatchScalarField.H @@ -75,7 +75,7 @@ public: const mappedFilmPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 3269713b21..0d59cd97ea 100644 --- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -81,7 +81,7 @@ JohnsonJacksonParticleSlipFvPatchVectorField const JohnsonJacksonParticleSlipFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : partialSlipFvPatchVectorField(ptf, p, iF, mapper), diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H index 0335d59ba5..635a094f16 100644 --- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H +++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H @@ -94,7 +94,7 @@ public: const JohnsonJacksonParticleSlipFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 6d0ed3e13a..a11dae3123 100644 --- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -97,7 +97,7 @@ JohnsonJacksonParticleThetaFvPatchScalarField const JohnsonJacksonParticleThetaFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), diff --git a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H index 8e1d01e125..2b45fc3912 100644 --- a/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H +++ b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H @@ -97,7 +97,7 @@ public: const JohnsonJacksonParticleThetaFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C index 1b56dac4fe..52322ec9a3 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "alphatPhaseChangeWallFunctionBase.H" -#include "fvPatchFieldMapper.H" #include "volFields.H" #include "phaseInterface.H" #include "phaseSystem.H" diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index adafca6000..be76dfd623 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -687,7 +687,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField const alphatWallBoilingWallFunctionFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(psf, p, iF, mapper), @@ -752,7 +752,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField void alphatWallBoilingWallFunctionFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchScalarField::map(ptf, mapper); diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H index e72fc32237..1f07547215 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H @@ -317,7 +317,7 @@ public: const alphatWallBoilingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -394,11 +394,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C index 74fe1fd735..a28474f81b 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "coupledMultiphaseTemperatureFvPatchScalarField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "phaseSystem.H" #include "compressibleMomentumTransportModel.H" #include "phaseCompressibleMomentumTransportModel.H" @@ -190,7 +190,7 @@ coupledMultiphaseTemperatureFvPatchScalarField const coupledMultiphaseTemperatureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledTemperatureFvPatchScalarField(psf, p, iF, mapper) diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H index 2d2e13ff77..8a030f427b 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H @@ -113,7 +113,7 @@ public: const coupledMultiphaseTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C index a9ab0c988b..277ceb92f2 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C @@ -111,7 +111,7 @@ multiphaseExternalTemperatureFvPatchScalarField const multiphaseExternalTemperatureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : externalTemperatureFvPatchScalarField(psf, p, iF, mapper) diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H index d8b7d685f1..2eb5efd85d 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H @@ -99,7 +99,7 @@ public: const multiphaseExternalTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C index 7434310bfa..7d45641e68 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C +++ b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "smoluchowskiJumpTFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "basicThermo.H" #include "mathematicalConstants.H" @@ -85,7 +85,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField const smoluchowskiJumpTFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), @@ -117,7 +117,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField void Foam::smoluchowskiJumpTFvPatchScalarField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchField::map(ptf, mapper); diff --git a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.H b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.H index 90eb28d822..809c6e9d0b 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.H +++ b/applications/modules/shockFluid/derivedFvPatchFields/T/smoluchowskiJumpTFvPatchScalarField.H @@ -97,7 +97,7 @@ public: const smoluchowskiJumpTFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -125,11 +125,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C index 99c31aaef6..c335a93b79 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "maxwellSlipUFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "fvcGrad.H" @@ -90,7 +90,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField const maxwellSlipUFvPatchVectorField& mspvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFixedValueSlipFvPatchVectorField(mspvf, p, iF, mapper), @@ -128,7 +128,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField void Foam::maxwellSlipUFvPatchVectorField::map ( const fvPatchVectorField& pvf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFixedValueSlipFvPatchVectorField::map(pvf, mapper); diff --git a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.H b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.H index ecd9223c13..777b77f84e 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.H +++ b/applications/modules/shockFluid/derivedFvPatchFields/U/maxwellSlipUFvPatchVectorField.H @@ -102,7 +102,7 @@ public: const maxwellSlipUFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -130,11 +130,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C index 9835c09ff8..d50ff130c1 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C +++ b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C @@ -61,7 +61,7 @@ Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField const mixedFixedValueSlipFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper), @@ -89,7 +89,7 @@ template void Foam::mixedFixedValueSlipFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { transformFvPatchField::map(ptf, mapper); diff --git a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H index 142893915e..0f1cd98b24 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H +++ b/applications/modules/shockFluid/derivedFvPatchFields/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H @@ -97,7 +97,7 @@ public: const mixedFixedValueSlipFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -139,11 +139,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.C b/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.C index a49a9a73c4..9b5d73ef92 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.C +++ b/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "fixedRhoFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -48,7 +48,7 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField const fixedRhoFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.H b/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.H index fe727b31a5..4d3b320959 100644 --- a/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.H +++ b/applications/modules/shockFluid/derivedFvPatchFields/rho/fixedRhoFvPatchScalarField.H @@ -111,7 +111,7 @@ public: const fixedRhoFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Copy constructor setting internal field reference diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C index 0f5eb451c1..4b3d6e4138 100644 --- a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C +++ b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.C @@ -50,7 +50,7 @@ hydrostaticDisplacementFvPatchVectorField const hydrostaticDisplacementFvPatchVectorField& tdpvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : tractionDisplacementFvPatchVectorField(tdpvf, p, iF, mapper), diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.H b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.H index 96786237dc..f3e55b1509 100644 --- a/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.H +++ b/applications/modules/solidDisplacement/derivedFvPatchFields/hydrostaticDisplacement/hydrostaticDisplacementFvPatchVectorField.H @@ -87,7 +87,7 @@ public: const hydrostaticDisplacementFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index 20623fee51..c439bc9cc9 100644 --- a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -67,7 +67,7 @@ tractionDisplacementFvPatchVectorField const tractionDisplacementFvPatchVectorField& tdpvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedGradientFvPatchVectorField(tdpvf, p, iF, mapper), @@ -94,7 +94,7 @@ tractionDisplacementFvPatchVectorField void Foam::tractionDisplacementFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedGradientFvPatchVectorField::map(ptf, mapper); diff --git a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H index b7aa61e1ca..324eb5c669 100644 --- a/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H +++ b/applications/modules/solidDisplacement/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.H @@ -95,7 +95,7 @@ public: const tractionDisplacementFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -142,11 +142,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C index 0fcf49dfeb..49f9e9bdd5 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C @@ -58,7 +58,7 @@ Foam::fvFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer ) : labelList(mag(addressing) - 1), - directFvPatchFieldMapper(static_cast(*this)) + directFieldMapper(static_cast(*this)) {} diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H index 3a4f050589..b84e17de77 100644 --- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H @@ -40,7 +40,7 @@ SourceFiles #include "IOobjectList.H" #include "volFields.H" #include "surfaceFields.H" -#include "directFvPatchFieldMapper.H" +#include "directFieldMapper.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -63,7 +63,7 @@ public: class patchFieldDecomposer : public labelList, - public directFvPatchFieldMapper + public directFieldMapper { public: diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C index 5e13703208..e2ec2a3b26 100644 --- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C +++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.C @@ -35,11 +35,7 @@ Foam::pointFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer const labelList& directAddr ) : - pointPatchFieldMapperPatchRef - ( - completeMeshPatch, - procMeshPatch - ), + generalFieldMapper(), directAddressing_(procMeshPatch.size(), -1), hasUnmapped_(false) { diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H index 079f4c5b76..405d10ae86 100644 --- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H @@ -38,7 +38,7 @@ SourceFiles #include "pointMesh.H" #include "pointFields.H" -#include "pointPatchFieldMapperPatchRef.H" +#include "generalFieldMapper.H" #include "IOobjectList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -61,15 +61,17 @@ public: //- Point patch field decomposer class class patchFieldDecomposer : - public pointPatchFieldMapperPatchRef + public generalFieldMapper { // Private Data + //- ... labelList directAddressing_; - //- Does map contain any unmapped values + //- Does map contain any unmapped values? bool hasUnmapped_; + public: // Constructors diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H index 1577116cc8..35e76f8ce0 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H +++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H @@ -39,8 +39,6 @@ SourceFiles #include "PtrList.H" #include "surfaceFields.H" #include "IOobjectList.H" -#include "fvPatchFieldMapper.H" -#include "setSizeFvPatchFieldMapper.H" #include "labelIOList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorTemplates.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorTemplates.C index a105666e60..9ef76367c3 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorTemplates.C +++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorTemplates.C @@ -31,7 +31,8 @@ License #include "emptyFvPatchField.H" #include "emptyFvsPatchField.H" #include "processorCyclicFvPatch.H" -#include "reverseFvPatchFieldMapper.H" +#include "reverseFieldMapper.H" +#include "setSizeFieldMapper.H" #include "stringOps.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -213,7 +214,7 @@ Foam::fvFieldReconstructor::reconstructVolField procField.boundaryField()[procPatchi], completeMesh_.boundary()[completePatchi], DimensionedField::null(), - setSizeFvPatchFieldMapper + setSizeFieldMapper ( completeMesh_.boundary()[completePatchi].size() ) @@ -224,7 +225,7 @@ Foam::fvFieldReconstructor::reconstructVolField patchFields[completePatchi].map ( procField.boundaryField()[procPatchi], - reverseFvPatchFieldMapper + reverseFieldMapper ( faceProcAddressingBf_[proci][procPatchi] - 1 ) @@ -266,7 +267,7 @@ Foam::fvFieldReconstructor::reconstructVolField patchFields[completePatchi].map ( procField.boundaryField()[procPatchi], - reverseFvPatchFieldMapper + reverseFieldMapper ( faceProcAddressingBf_[proci][procPatchi] - 1 ) @@ -373,7 +374,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField procField.boundaryField()[procPatchi], completeMesh_.boundary()[completePatchi], DimensionedField::null(), - setSizeFvPatchFieldMapper + setSizeFieldMapper ( completeMesh_.boundary()[completePatchi].size() ) @@ -384,7 +385,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField patchFields[completePatchi].map ( procField.boundaryField()[procPatchi], - reverseFvPatchFieldMapper + reverseFieldMapper ( faceProcAddressingBf_[proci][procPatchi] - 1 ) @@ -409,7 +410,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField patchFields[completePatchi].map ( procField.boundaryField()[procPatchi], - reverseFvPatchFieldMapper + reverseFieldMapper ( faceProcAddressingBf_[proci][procPatchi] - 1 ) diff --git a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H index 479a59afa4..d077072f47 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H +++ b/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructor.H @@ -38,8 +38,6 @@ SourceFiles #include "pointMesh.H" #include "pointFields.H" -#include "pointPatchFieldMapper.H" -#include "setSizePointPatchFieldMapper.H" #include "IOobjectList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorTemplates.C b/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorTemplates.C index e5e1c583f2..7dfc969660 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorTemplates.C +++ b/applications/utilities/parallelProcessing/reconstructPar/pointFieldReconstructorTemplates.C @@ -25,7 +25,8 @@ License #include "pointFieldReconstructor.H" #include "fvMesh.H" -#include "reversePointPatchFieldMapper.H" +#include "reverseFieldMapper.H" +#include "setSizeFieldMapper.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -123,7 +124,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject) procField.boundaryField()[patchi], completeMesh_.boundary()[curBPatch], DimensionedField::null(), - setSizePointPatchFieldMapper + setSizeFieldMapper ( completeMesh_.boundary()[curBPatch].size() ) @@ -134,7 +135,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject) patchFields[curBPatch].map ( procField.boundaryField()[patchi], - reversePointPatchFieldMapper + reverseFieldMapper ( patchPointAddressing_[proci][patchi] ) diff --git a/applications/utilities/preProcessing/mapFields/meshToMesh0.H b/applications/utilities/preProcessing/mapFields/meshToMesh0.H index c88479e2b2..ece8970d85 100644 --- a/applications/utilities/preProcessing/mapFields/meshToMesh0.H +++ b/applications/utilities/preProcessing/mapFields/meshToMesh0.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ SourceFiles #include "fvMesh.H" #include "HashTable.H" -#include "fvPatchMapper.H" +#include "generalFieldMapper.H" #include "scalarList.H" #include "className.H" @@ -179,7 +179,7 @@ public: //- Patch-field interpolation class class patchFieldInterpolator : - public generalFvPatchFieldMapper + public generalFieldMapper { const labelList& directAddressing_; diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C index e680b6fe6f..7ae00515ef 100644 --- a/etc/codeTemplates/BC/BC.C +++ b/etc/codeTemplates/BC/BC.C @@ -25,7 +25,7 @@ License #include "CONSTRUCT.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -84,7 +84,7 @@ CONSTRUCT const CLASS& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : PARENT(ptf, p, iF, mapper), @@ -123,7 +123,7 @@ template void Foam::CLASS::map ( const FVPATCHF& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { PARENT::map(ptf, mapper); diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H index 0efab702b3..0c054adb87 100644 --- a/etc/codeTemplates/BC/BC.H +++ b/etc/codeTemplates/BC/BC.H @@ -147,7 +147,7 @@ public: const CLASS&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -185,11 +185,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const FVPATCHF&, - const fvPatchFieldMapper& - ); + virtual void map(const FVPATCHF&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C index 0746739419..aa4ff17946 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C @@ -25,7 +25,7 @@ License #include "codedFixedValueFvPatchFieldTemplate.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "unitConversion.H" @@ -107,7 +107,7 @@ ${typeName}FixedValueFvPatch${FieldType} const ${typeName}FixedValueFvPatch${FieldType}& ptf, const fvPatch& p, const DimensionedField<${TemplateType}, volMesh>& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField<${TemplateType}>(ptf, p, iF, mapper) diff --git a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.H index 19fb50ff34..7098e90c6e 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.H @@ -75,7 +75,7 @@ public: const ${typeName}FixedValueFvPatch${FieldType}&, const fvPatch&, const DimensionedField<${TemplateType}, volMesh>&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C index ca5cd6028d..c2b87df682 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C @@ -25,7 +25,7 @@ License #include "codedFixedValuePointPatchFieldTemplate.H" #include "addToRunTimeSelectionTable.H" -#include "pointPatchFieldMapper.H" +#include "fieldMapper.H" #include "pointFields.H" #include "unitConversion.H" //{{{ begin codeInclude @@ -106,7 +106,7 @@ ${typeName}FixedValuePointPatch${FieldType} const ${typeName}FixedValuePointPatch${FieldType}& ptf, const pointPatch& p, const DimensionedField<${TemplateType}, pointMesh>& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField<${TemplateType}>(ptf, p, iF, mapper) diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H index b096e9e967..41e6a91473 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H @@ -75,7 +75,7 @@ public: const ${typeName}FixedValuePointPatch${FieldType}&, const pointPatch&, const DimensionedField<${TemplateType}, pointMesh>&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C index cea03d2c56..ef3d08038f 100644 --- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C @@ -25,7 +25,6 @@ License #include "codedFvModelTemplate.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "unitConversion.H" diff --git a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C index 8abe8ffa40..c15ee39e58 100644 --- a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C @@ -25,7 +25,7 @@ License #include "codedMixedFvPatchFieldTemplate.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "unitConversion.H" @@ -107,7 +107,7 @@ ${typeName}MixedValueFvPatch${FieldType} const ${typeName}MixedValueFvPatch${FieldType}& ptf, const fvPatch& p, const DimensionedField<${TemplateType}, volMesh>& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField<${TemplateType}>(ptf, p, iF, mapper) diff --git a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.H index b2de5404c2..6591931b91 100644 --- a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.H @@ -75,7 +75,7 @@ public: const ${typeName}MixedValueFvPatch${FieldType}&, const fvPatch&, const DimensionedField<${TemplateType}, volMesh>&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index 9d1aa09951..78a9a78279 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "turbulentMixingLengthDissipationRateInletFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "volFields.H" #include "momentumTransportModel.H" @@ -65,7 +65,7 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField const turbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H index da27f631a3..fa6ddb93a2 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H @@ -122,7 +122,7 @@ public: const turbulentMixingLengthDissipationRateInletFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index 5d564a56a4..b0d3e91410 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "turbulentMixingLengthFrequencyInletFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "volFields.H" #include "momentumTransportModel.H" @@ -65,7 +65,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField const turbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H index 4b471aaedf..11f8853808 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H @@ -122,7 +122,7 @@ public: const turbulentMixingLengthFrequencyInletFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C index c67a746d8b..700a19553d 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "fixedShearStressFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "momentumTransportModel.H" @@ -51,7 +51,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField const fixedShearStressFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H index 1d19289c57..f97b0a2eb4 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H @@ -79,7 +79,7 @@ public: const fixedShearStressFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index e6d833bece..9a3a1415b2 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C @@ -58,7 +58,7 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField const porousBafflePressureFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedJumpFvPatchField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H index a7b168e589..ed53bbed42 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H @@ -146,7 +146,7 @@ public: const porousBafflePressureFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 9a566acb87..2ca93d843e 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -263,7 +263,7 @@ epsilonWallFunctionFvPatchScalarField const epsilonWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H index 0e0d5f9a42..eabb47ff13 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H @@ -169,7 +169,7 @@ public: const epsilonWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index 4cef2dca37..7fce412962 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -54,7 +54,7 @@ fWallFunctionFvPatchScalarField::fWallFunctionFvPatchScalarField const fWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H index 36688d68e1..a4f60a2400 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H @@ -93,7 +93,7 @@ public: const fWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index 3f7cad1c0e..3aad77ec05 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -52,7 +52,7 @@ kLowReWallFunctionFvPatchScalarField::kLowReWallFunctionFvPatchScalarField const kLowReWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H index 5a48f9ae95..7d95d366a5 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H @@ -103,7 +103,7 @@ public: const kLowReWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C index bea2dc1127..83c8dfb6b5 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C @@ -46,7 +46,7 @@ Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField const kqRWallFunctionFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H index 953881447c..3b87fffa77 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H @@ -92,7 +92,7 @@ public: const kqRWallFunctionFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C index 6d2a167531..2876ea883b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutLowReWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -60,7 +60,7 @@ nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField const nutLowReWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H index ce622c9769..1905ed9b13 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H @@ -97,7 +97,7 @@ public: const nutLowReWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 1b463ca90e..04aafae92c 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutURoughWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -227,7 +227,7 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField const nutURoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutUWallFunctionFvPatchScalarField(ptf, p, iF, mapper), @@ -253,7 +253,7 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField void nutURoughWallFunctionFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { nutUWallFunctionFvPatchScalarField::map(ptf, mapper); diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H index 0cfaf9f8d9..d07217a2bf 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H @@ -129,7 +129,7 @@ public: const nutURoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -191,11 +191,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index af4fc83353..7e85ec6469 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutUSpaldingWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -137,7 +137,7 @@ nutUSpaldingWallFunctionFvPatchScalarField const nutUSpaldingWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index af4dc28693..46a6a62649 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H @@ -119,7 +119,7 @@ public: const nutUSpaldingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index 42fc8244a2..f4b485ed78 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutUWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -131,7 +131,7 @@ nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField const nutUWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H index 7716f22777..cb2865ad92 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H @@ -99,7 +99,7 @@ public: const nutUWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C index c00bcdf930..eb4c8416fd 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "wallFvPatch.H" #include "addToRunTimeSelectionTable.H" @@ -87,7 +87,7 @@ Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField const nutWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H index 2a4f1cb9f9..769b438e4f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H @@ -134,7 +134,7 @@ public: const nutWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index b42b63771e..54f9d8be1f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutkRoughWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -144,7 +144,7 @@ nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField const nutkRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), @@ -170,7 +170,7 @@ nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField void nutkRoughWallFunctionFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { nutkWallFunctionFvPatchScalarField::map(ptf, mapper); diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H index 585b529981..85f15d87e3 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H @@ -133,7 +133,7 @@ public: const nutkRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -195,11 +195,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index 837389c57d..6050d4ec21 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutkWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "wallFvPatch.H" #include "addToRunTimeSelectionTable.H" @@ -89,7 +89,7 @@ nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField const nutkWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H index ce24ec544a..736c98576b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H @@ -96,7 +96,7 @@ public: const nutkWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 8ff6dc89b3..3e3dac5431 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -305,7 +305,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField const omegaWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H index b9c8872b2e..f6f85aa7a6 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H @@ -177,7 +177,7 @@ public: const omegaWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index 95bf518a97..0496af7eb2 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -53,7 +53,7 @@ v2WallFunctionFvPatchScalarField::v2WallFunctionFvPatchScalarField const v2WallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H index e425aace64..d37b00bc3c 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H @@ -95,7 +95,7 @@ public: const v2WallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.C index c0dde80b1a..b52033c44d 100644 --- a/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.C @@ -55,7 +55,7 @@ epsilonmWallFunctionFvPatchScalarField const epsilonmWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper) diff --git a/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.H index 8f55c1110a..b6150478f4 100644 --- a/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/phaseCompressible/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonmWallFunction/epsilonmWallFunctionFvPatchScalarField.H @@ -81,7 +81,7 @@ public: const epsilonmWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.C index afacfd8b9e..cfde23d2e5 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.C +++ b/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,38 @@ License #include "directFieldMapper.H" +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +void Foam::directFieldMapper::map +( + Field& f, + const Field& mapF +) const +{ + if (notNull(addressing_) && addressing_.size()) + { + f.map(mapF, addressing_); + } + else + { + f.setSize(0); + } +} + + +template +Foam::tmp> Foam::directFieldMapper::map +( + const Field& mapF +) const +{ + tmp> tf(new Field(addressing_.size())); + map(tf.ref(), mapF); + return tf; +} + + // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // FOR_ALL_FIELD_TYPES(IMPLEMENT_FIELD_MAPPER_OPERATOR, directFieldMapper) diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.H index 93aa8a5759..369345b31f 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/directFieldMapper/directFieldMapper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,13 +45,24 @@ namespace Foam class directFieldMapper : - virtual public fieldMapper + public fieldMapper { + // Private Data + + //- Addressing from new back to old + const labelUList& addressing_; + + //- Does map contain any unmapped values + bool hasUnmapped_; + + // Private Member Functions + //- Map a field in-place template void map(Field& f, const Field& mapF) const; + //- Map a field and return the result template tmp> map(const Field& f) const; @@ -60,9 +71,17 @@ public: // Constructors - //- Null constructor - directFieldMapper() - {} + //- Construct given addressing + directFieldMapper(const labelUList& addressing) + : + addressing_(addressing), + hasUnmapped_(false) + { + if (addressing_.size() && min(addressing_) < 0) + { + hasUnmapped_ = true; + } + } //- Destructor @@ -72,12 +91,11 @@ public: // Member Functions - //- Are there unmapped values? I.e. do all size() elements get - // get value - virtual bool hasUnmapped() const = 0; - - //- Access to the direct map addressing - virtual const labelUList& addressing() const = 0; + //- Are there unmapped values? Do all elements get get a value? + virtual bool hasUnmapped() const + { + return hasUnmapped_; + } // Member Operators @@ -96,12 +114,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository - #include "directFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/fieldMapper/fieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/fieldMapper/fieldMapper.H index 34a5e18c1e..97c6df879c 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/fieldMapper/fieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/fieldMapper/fieldMapper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,8 +63,7 @@ public: // Member Functions - //- Are there unmapped values? I.e. do all size() elements get - // get value + //- Are there unmapped values? Do all elements get get a value? virtual bool hasUnmapped() const = 0; diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.C index d31b00998d..ea0ca7dfc8 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.C +++ b/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,58 @@ License #include "generalFieldMapper.H" +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +void Foam::generalFieldMapper::map +( + Field& f, + const Field& mapF +) const +{ + if (direct()) + { + if (notNull(directAddressing()) && directAddressing().size()) + { + f.map(mapF, directAddressing()); + } + else + { + f.setSize(0); + } + } + else + { + if (notNull(addressing()) && addressing().size()) + { + f.map(mapF, addressing(), weights()); + } + else + { + f.setSize(0); + } + } +} + + +template +Foam::tmp> Foam::generalFieldMapper::map +( + const Field& mapF +) const +{ + tmp> tf + ( + new Field + ( + direct() ? directAddressing().size() : addressing().size() + ) + ); + map(tf.ref(), mapF); + return tf; +} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // const Foam::labelUList& Foam::generalFieldMapper::directAddressing() const diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.H index 16bb850135..99968f945e 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,13 +45,15 @@ namespace Foam class generalFieldMapper : - virtual public fieldMapper + public fieldMapper { // Private Member Functions + //- Map a field in-place template void map(Field& f, const Field& mapF) const; + //- Map a field and return the result template tmp> map(const Field& f) const; @@ -72,16 +74,19 @@ public: // Member Functions + //- Is the mapper direct? virtual bool direct() const = 0; - //- Are there unmapped values? I.e. do all size() elements get - // get value + //- Are there unmapped values? Do all elements get get a value? virtual bool hasUnmapped() const = 0; + //- Access the direct addressing virtual const labelUList& directAddressing() const; + //- Access the general addressing virtual const labelListList& addressing() const; + //- Access the general weights virtual const scalarListList& weights() const; @@ -101,12 +106,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository - #include "generalFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapperTemplates.C b/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapperTemplates.C deleted file mode 100644 index f165827aa3..0000000000 --- a/src/OpenFOAM/fields/Fields/fieldMappers/generalFieldMapper/generalFieldMapperTemplates.C +++ /dev/null @@ -1,80 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "generalFieldMapper.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::generalFieldMapper::map -( - Field& f, - const Field& mapF -) const -{ - if (direct()) - { - if (notNull(directAddressing()) && directAddressing().size()) - { - f.map(mapF, directAddressing()); - } - else - { - f.setSize(0); - } - } - else - { - if (notNull(addressing()) && addressing().size()) - { - f.map(mapF, addressing(), weights()); - } - else - { - f.setSize(0); - } - } -} - - -template -Foam::tmp> Foam::generalFieldMapper::map -( - const Field& mapF -) const -{ - tmp> tf - ( - new Field - ( - direct() ? directAddressing().size() : addressing().size() - ) - ); - map(tf.ref(), mapF); - return tf; -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.C index 10f0b200e3..79a3a20290 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.C +++ b/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.C @@ -25,6 +25,29 @@ License #include "identityFieldMapper.H" +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +void Foam::identityFieldMapper::map +( + Field& f, + const Field& mapF +) const +{ + f = mapF; +} + + +template +Foam::tmp> Foam::identityFieldMapper::map +( + const Field& mapF +) const +{ + return mapF; +} + + // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // FOR_ALL_FIELD_TYPES(IMPLEMENT_FIELD_MAPPER_OPERATOR, identityFieldMapper) diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.H index 9efb1f24fe..d24e199843 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapper.H @@ -45,13 +45,15 @@ namespace Foam class identityFieldMapper : - virtual public fieldMapper + public fieldMapper { // Private Member Functions + //- Map a field in-place template void map(Field& f, const Field& mapF) const; + //- Map a field and return the result template tmp> map(const Field& f) const; @@ -72,8 +74,7 @@ public: // Member Functions - //- Are there unmapped values? I.e. do all size() elements get - // get value + //- Are there unmapped values? Do all elements get get a value? virtual bool hasUnmapped() const { return false; @@ -96,12 +97,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository - #include "identityFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.C index 96ee1712d3..b75875e694 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.C +++ b/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.C @@ -25,6 +25,33 @@ License #include "reverseFieldMapper.H" +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +void Foam::reverseFieldMapper::map +( + Field& f, + const Field& mapF +) const +{ + if (notNull(addressing_) && addressing_.size()) + { + f.rmap(mapF, addressing_); + } +} + + +template +Foam::tmp> Foam::reverseFieldMapper::map +( + const Field& mapF +) const +{ + NotImplemented; + return tmp>(nullptr); +} + + // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // FOR_ALL_FIELD_TYPES(IMPLEMENT_FIELD_MAPPER_OPERATOR, reverseFieldMapper) diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.H index de34b8b02e..25ce974e7e 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/reverseFieldMapper/reverseFieldMapper.H @@ -45,13 +45,24 @@ namespace Foam class reverseFieldMapper : - virtual public fieldMapper + public fieldMapper { + // Private Data + + //- Addressing from new back to old + const labelUList& addressing_; + + //- Does map contain any unmapped values + bool hasUnmapped_; + + // Private Member Functions + //- Map a field in-place template void map(Field& f, const Field& mapF) const; + //- Map a field and return the result template tmp> map(const Field& f) const; @@ -60,9 +71,17 @@ public: // Constructors - //- Null constructor - reverseFieldMapper() - {} + //- Construct given addressing + reverseFieldMapper(const labelUList& addressing) + : + addressing_(addressing), + hasUnmapped_(false) + { + if (addressing_.size() && min(addressing_) < 0) + { + hasUnmapped_ = true; + } + } //- Destructor @@ -72,12 +91,11 @@ public: // Member Functions - //- Are there unmapped values? I.e. do all size() elements get - // get value - virtual bool hasUnmapped() const = 0; - - //- Access to the reverse map addressing - virtual const labelUList& addressing() const = 0; + //- Are there unmapped values? Do all elements get get a value? + virtual bool hasUnmapped() const + { + return hasUnmapped_; + } // Member Operators @@ -96,12 +114,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository - #include "reverseFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.C b/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.C index 123d61efc2..5e4e8a1181 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.C +++ b/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,12 +25,23 @@ License #include "setSizeFieldMapper.H" -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -Foam::setSizeFieldMapper::setSizeFieldMapper(const label size) -: - size_(size) -{} +template +void Foam::setSizeFieldMapper::map(Field& f, const Field&) const +{ + f.setSize(size_); +} + + +template +Foam::tmp> Foam::setSizeFieldMapper::map +( + const Field& +) const +{ + return tmp>(new Field(size_)); +} // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.H b/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.H index 9b0447d185..082c66ceec 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.H +++ b/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,19 +45,21 @@ namespace Foam class setSizeFieldMapper : - virtual public fieldMapper + public fieldMapper { - // Private member data + // Private Data //- The size the mapper will set the fields to have - label size_; + const label size_; // Private Member Functions + //- Map a field in-place template void map(Field& f, const Field&) const; + //- Map a field and return the result template tmp> map(const Field&) const; @@ -67,7 +69,10 @@ public: // Constructors //- Construct given size - setSizeFieldMapper(const label size); + setSizeFieldMapper(const label size) + : + size_(size) + {} //- Destructor @@ -100,12 +105,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository - #include "setSizeFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C index adb7bef77b..4150d51d6c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::basicSymmetryPointPatchField::basicSymmetryPointPatchField const basicSymmetryPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H index c3cfcde9ee..559209baa9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H @@ -78,7 +78,7 @@ public: const basicSymmetryPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C index d97e107911..9cce418fd0 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ Foam::calculatedPointPatchField::calculatedPointPatchField const calculatedPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H index d13e2c59c5..9898168dba 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ public: const calculatedPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C index 6ed24e6daa..5a8ea114ec 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::coupledPointPatchField::coupledPointPatchField const coupledPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H index 119e1599c7..d6add8a8d2 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const coupledPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C index 0ab6621e2d..fcfe69b81a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Foam::fixedValuePointPatchField::fixedValuePointPatchField const fixedValuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : valuePointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H index 3367377a1f..a11ddada29 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const fixedValuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C index 616a55798d..80dcb1f854 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "valuePointPatchField.H" -#include "pointPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -96,7 +96,7 @@ Foam::valuePointPatchField::valuePointPatchField const valuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper), @@ -122,7 +122,7 @@ template void Foam::valuePointPatchField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { const valuePointPatchField& vptf = diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H index bfac9241ea..a5f3c52c73 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H @@ -88,7 +88,7 @@ public: const valuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -132,11 +132,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C index 645215343c..795deaa8c9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::zeroGradientPointPatchField::zeroGradientPointPatchField const zeroGradientPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H index 4beeb444da..d3ea0ab121 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ public: const zeroGradientPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C index 8cf2b24c69..6b5f9b372a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ Foam::cyclicPointPatchField::cyclicPointPatchField const cyclicPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledPointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H index e749241420..f17bf72871 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,7 @@ public: const cyclicPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C index d2e4c47de9..4d3891e95c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::cyclicSlipPointPatchField::cyclicSlipPointPatchField const cyclicSlipPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicPointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H index d4329197a7..f289df5828 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const cyclicSlipPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C index 1f0f651e9f..6865709ac0 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ Foam::emptyPointPatchField::emptyPointPatchField const emptyPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H index 3f326338d0..3ee0311359 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const emptyPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.C index 9a7a2f388b..7e6ad5f61c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ Foam::internalPointPatchField::internalPointPatchField const internalPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.H index 132d65eb04..96d4f2070d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchField.H @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ public: const internalPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C index 98f82bff73..f7cf0e7bb9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::processorPointPatchField::processorPointPatchField const processorPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledPointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H index e9ad149a9a..0405058d15 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H @@ -87,7 +87,7 @@ public: const processorPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C index 2898a18496..ff127130f1 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C @@ -60,7 +60,7 @@ Foam::processorCyclicPointPatchField::processorCyclicPointPatchField const processorCyclicPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledPointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H index 7d264262f9..0500565c2d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H @@ -87,7 +87,7 @@ public: const processorCyclicPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C index e85b3e4f40..fcb933f51c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ Foam::symmetryPointPatchField::symmetryPointPatchField const symmetryPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryPointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H index 630f4b9a77..54182e5373 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const symmetryPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C index 52625984bc..a35574e58b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField const symmetryPlanePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryPointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H index f6d6dd6af2..239bd6b83e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,7 @@ public: const symmetryPlanePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C index 36ee469bb2..f3ada74db9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ Foam::wedgePointPatchField::wedgePointPatchField const wedgePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H index f8fe8d4906..eb38632ffe 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const wedgePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C index e2ce06b437..2921400a57 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C @@ -25,7 +25,7 @@ License #include "codedFixedValuePointPatchField.H" #include "addToRunTimeSelectionTable.H" -#include "pointPatchFieldMapper.H" +#include "fieldMapper.H" #include "pointFields.H" #include "dynamicCode.H" #include "dynamicCodeContext.H" @@ -109,7 +109,7 @@ Foam::codedFixedValuePointPatchField::codedFixedValuePointPatchField const codedFixedValuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H index 0524678c32..d93251b49d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H @@ -140,7 +140,7 @@ public: const codedFixedValuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C index 5106fd6cd3..bcd19696f1 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Foam::fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField const fixedNormalSlipPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : slipPointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H index f29a78e7cc..f6ac1bc9bf 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ public: const fixedNormalSlipPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C index 67e0a5e6ba..fff4ead883 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::slipPointPatchField::slipPointPatchField const slipPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryPointPatchField(ptf, p, iF, mapper) diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H index cf5b5063a0..2c228111e5 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ public: const slipPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C index a8e5374abf..1aa434d071 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C @@ -61,7 +61,7 @@ uniformFixedValuePointPatchField const uniformFixedValuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H index bbeb387003..5bb07cc499 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H @@ -92,7 +92,7 @@ public: const uniformFixedValuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/directPointPatchFieldMapper.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/directPointPatchFieldMapper.H deleted file mode 100644 index 61d3cc4ea0..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/directPointPatchFieldMapper.H +++ /dev/null @@ -1,105 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::directPointPatchFieldMapper - -Description - direct pointPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef directPointPatchFieldMapper_H -#define directPointPatchFieldMapper_H - -#include "pointPatchFieldMapper.H" -#include "directFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class directPointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class directPointPatchFieldMapper -: - public pointPatchFieldMapper, - public directFieldMapper -{ - // Private Data - - //- Addressing from new back to old - const labelUList& addressing_; - - //- Does map contain any unmapped values - bool hasUnmapped_; - - -public: - - // Constructors - - //- Construct given addressing - directPointPatchFieldMapper(const labelUList& addressing) - : - addressing_(addressing), - hasUnmapped_(false) - { - if (addressing_.size() && min(addressing_) < 0) - { - hasUnmapped_ = true; - } - } - - - //- Destructor - virtual ~directPointPatchFieldMapper() - {} - - - // Member Functions - - bool hasUnmapped() const - { - return hasUnmapped_; - } - - const labelUList& addressing() const - { - return addressing_; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C index 70b91be683..7ca59c2e09 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ Foam::pointPatchField::pointPatchField const pointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& + const fieldMapper& ) : patch_(p), diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index a09fc075f7..404bccdea5 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H @@ -44,6 +44,7 @@ SourceFiles #include "pointPatch.H" #include "DimensionedField.H" +#include "pointPatchFieldMapperFwd.H" #include "fieldTypes.H" #include "autoPtr.H" @@ -56,7 +57,7 @@ namespace Foam class objectRegistry; class dictionary; -class pointPatchFieldMapper; +class fieldMapper; class pointMesh; // Forward declaration of friend functions and operators @@ -128,7 +129,7 @@ public: const pointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& m + const fieldMapper& m ), (dynamic_cast(ptf), p, iF, m) ); @@ -170,7 +171,7 @@ public: const pointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -239,7 +240,7 @@ public: const pointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Return a pointer to a new patchField created on freestore @@ -399,11 +400,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ) + virtual void map(const pointPatchField&, const fieldMapper&) {} //- Reset the pointPatchField to the given pointPatchField diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H index d8dbfed4ec..0a44b4547b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapper.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) 2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,69 +21,13 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class - Foam::pointPatchFieldMapper - -Description - Foam::pointPatchFieldMapper - \*---------------------------------------------------------------------------*/ #ifndef pointPatchFieldMapper_H #define pointPatchFieldMapper_H -#include "primitiveFields.H" -#include "generalFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class pointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class pointPatchFieldMapper -: - virtual public fieldMapper -{ - -public: - - // Constructors - - //- Null constructor - pointPatchFieldMapper() - {} -}; - - -/*---------------------------------------------------------------------------*\ - Class generalPointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class generalPointPatchFieldMapper -: - public pointPatchFieldMapper, - public generalFieldMapper -{ - -public: - - // Constructors - - //- Null constructor - generalPointPatchFieldMapper() - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "fieldMapper.H" +#include "pointPatchFieldMapperFwd.H" #endif diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapperTemplates.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperFwd.H similarity index 70% rename from src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapperTemplates.C rename to src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperFwd.H index aae05042ab..0435d0ec28 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/setSizeFieldMapper/setSizeFieldMapperTemplates.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldMapperFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,27 +21,28 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Typedef + Foam::pointPatchFieldMapper + +Description + Backwards compatibility definition for the removal of pointPatchFieldMapper + \*---------------------------------------------------------------------------*/ -#include "setSizeFieldMapper.H" +#ifndef pointPatchFieldMapperFwd_H +#define pointPatchFieldMapperFwd_H -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template -void Foam::setSizeFieldMapper::map(Field& f, const Field&) const +namespace Foam { - f.setSize(size_); + class fieldMapper; + + typedef fieldMapper pointPatchFieldMapper; } +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template -Foam::tmp> Foam::setSizeFieldMapper::map -( - const Field& -) const -{ - return tmp>(new Field(size_)); -} - +#endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index 766b0f391b..092bf0957a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -174,7 +174,7 @@ Foam::autoPtr> Foam::pointPatchField::New const pointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& pfMapper + const fieldMapper& pfMapper ) { if (debug) diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/reversePointPatchFieldMapper.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/reversePointPatchFieldMapper.H deleted file mode 100644 index ffbc01bb3a..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/reversePointPatchFieldMapper.H +++ /dev/null @@ -1,105 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::reversePointPatchFieldMapper - -Description - reverse pointPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef reversePointPatchFieldMapper_H -#define reversePointPatchFieldMapper_H - -#include "pointPatchFieldMapper.H" -#include "reverseFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class reversePointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class reversePointPatchFieldMapper -: - public pointPatchFieldMapper, - public reverseFieldMapper -{ - // Private Data - - //- Addressing from new back to old - const labelUList& addressing_; - - //- Does map contain any unmapped values - bool hasUnmapped_; - - -public: - - // Constructors - - //- Construct given addressing - reversePointPatchFieldMapper(const labelUList& addressing) - : - addressing_(addressing), - hasUnmapped_(false) - { - if (addressing_.size() && min(addressing_) < 0) - { - hasUnmapped_ = true; - } - } - - - //- Destructor - virtual ~reversePointPatchFieldMapper() - {} - - - // Member Functions - - bool hasUnmapped() const - { - return hasUnmapped_; - } - - const labelUList& addressing() const - { - return addressing_; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/setSizePointPatchFieldMapper.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/setSizePointPatchFieldMapper.H deleted file mode 100644 index b66b66f41a..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/setSizePointPatchFieldMapper.H +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::setSizePointPatchFieldMapper - -Description - Set size pointPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef setSizePointPatchFieldMapper_H -#define setSizePointPatchFieldMapper_H - -#include "pointPatchFieldMapper.H" -#include "setSizeFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class setSizePointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class setSizePointPatchFieldMapper -: - public pointPatchFieldMapper, - public setSizeFieldMapper -{ -public: - - // Constructors - - //- Construct - setSizePointPatchFieldMapper(const label size) - : - setSizeFieldMapper(size) - {} - - - //- Destructor - virtual ~setSizePointPatchFieldMapper() - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C index 6d213c0d29..d38421883f 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C +++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,7 @@ Foam::pointPatchMapper::pointPatchMapper const polyTopoChangeMap& map ) : - generalPointPatchFieldMapper(), + generalFieldMapper(), patch_(patch), pointMapper_(pointMap), map_(map), diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H index b4960e28f2..785d4b7fc7 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H +++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H @@ -36,7 +36,6 @@ SourceFiles #define pointPatchMapper_H #include "pointMapper.H" -#include "pointPatchFieldMapper.H" #include "pointPatch.H" #include "primitiveFields.H" @@ -55,7 +54,7 @@ class polyTopoChangeMap; class pointPatchMapper : - public generalPointPatchFieldMapper + public generalFieldMapper { // Private Data diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C index 7df240aac9..4705194c9a 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.C @@ -26,7 +26,7 @@ License #include "coupledTemperatureFvPatchScalarField.H" #include "thermophysicalTransportModel.H" #include "volFields.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "mappedPatchBase.H" #include "addToRunTimeSelectionTable.H" @@ -211,7 +211,7 @@ coupledTemperatureFvPatchScalarField const coupledTemperatureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(psf, p, iF, mapper), diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.H b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.H index 3d00ee4cea..de8613ae5c 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/coupledTemperature/coupledTemperatureFvPatchScalarField.H @@ -185,7 +185,7 @@ public: const coupledTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C index f938be895a..ef7b153e60 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.C @@ -153,7 +153,7 @@ externalTemperatureFvPatchScalarField const externalTemperatureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), @@ -209,7 +209,7 @@ externalTemperatureFvPatchScalarField void Foam::externalTemperatureFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchScalarField::map(ptf, mapper); diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.H b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.H index eb6f8081a1..fc447bfece 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/externalTemperature/externalTemperatureFvPatchScalarField.H @@ -207,7 +207,7 @@ public: const externalTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -252,11 +252,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index f02df4b83e..3bd490ef7e 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -62,7 +62,7 @@ alphatJayatillekeWallFunctionFvPatchScalarField const alphatJayatillekeWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H index 0eadbcd079..86a45a9a84 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H @@ -116,7 +116,7 @@ public: const alphatJayatillekeWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index dcac447a8c..21abacdb26 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -53,7 +53,7 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField const alphatWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index a2cb4b930a..50adb26a2e 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -119,7 +119,7 @@ public: const alphatWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index 166b54c080..e58bf1e647 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -55,7 +55,7 @@ convectiveHeatTransferFvPatchScalarField const convectiveHeatTransferFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H index b0399413b0..e30b4c62f0 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H @@ -122,7 +122,7 @@ public: const convectiveHeatTransferFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index 2caaae32c3..d13865a5ac 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C @@ -59,7 +59,7 @@ externalCoupledTemperatureMixedFvPatchScalarField const externalCoupledTemperatureMixedFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : externalCoupledMixedFvPatchField(ptf, p, iF, mapper) diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H index 3147859b8f..00fe7ea18f 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H @@ -163,7 +163,7 @@ public: const externalCoupledTemperatureMixedFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index e91736d6c4..b961d73200 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -112,7 +112,7 @@ thermalBaffle1DFvPatchScalarField const thermalBaffle1DFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), @@ -242,7 +242,7 @@ template void thermalBaffle1DFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchScalarField::map(ptf, mapper); diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H index 6e5c91b8e9..d11d1884c4 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H @@ -182,7 +182,7 @@ public: const thermalBaffle1DFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -216,11 +216,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C index 831d93cb17..05cfcf202c 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C @@ -67,7 +67,7 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField const totalFlowRateAdvectiveDiffusiveFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), @@ -96,7 +96,7 @@ totalFlowRateAdvectiveDiffusiveFvPatchScalarField void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchField::map(ptf, mapper); diff --git a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H index a6a70ec059..b5909fa1ac 100644 --- a/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H @@ -89,7 +89,7 @@ public: const totalFlowRateAdvectiveDiffusiveFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -128,11 +128,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C index 002bfc8821..2294d743fe 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C @@ -131,7 +131,7 @@ Foam::atmBoundaryLayer::atmBoundaryLayer Foam::atmBoundaryLayer::atmBoundaryLayer ( const atmBoundaryLayer& abl, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : flowDir_(abl.flowDir_), @@ -173,7 +173,7 @@ Foam::atmBoundaryLayer::atmBoundaryLayer(const atmBoundaryLayer& abl) void Foam::atmBoundaryLayer::map ( const atmBoundaryLayer& blptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mapper(z0_, blptf.z0_); diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H index 405cf4c3f3..0eb4afff7f 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H @@ -217,7 +217,7 @@ public: atmBoundaryLayer ( const atmBoundaryLayer&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Copy constructor @@ -250,7 +250,7 @@ public: // Mapping functions //- Map the given atmBoundaryLayer onto this atmBoundaryLayer - void map(const atmBoundaryLayer&, const fvPatchFieldMapper&); + void map(const atmBoundaryLayer&, const fieldMapper&); //- Reset the atmBoundaryLayer to the given atmBoundaryLayer // Used for mesh to mesh mapping diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C index bff9ec6588..812bcc15d2 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "atmBoundaryLayerInletEpsilonFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -70,7 +70,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField const atmBoundaryLayerInletEpsilonFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(psf, p, iF, mapper), @@ -95,7 +95,7 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField void atmBoundaryLayerInletEpsilonFvPatchScalarField::map ( const fvPatchScalarField& psf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { inletOutletFvPatchScalarField::map(psf, mapper); diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H index a7e745482a..1f57c2ba9d 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H @@ -98,7 +98,7 @@ public: const atmBoundaryLayerInletEpsilonFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -126,11 +126,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C index 5a2a37fb97..e00134c7ce 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "atmBoundaryLayerInletKFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -70,7 +70,7 @@ atmBoundaryLayerInletKFvPatchScalarField const atmBoundaryLayerInletKFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(psf, p, iF, mapper), @@ -95,7 +95,7 @@ atmBoundaryLayerInletKFvPatchScalarField void atmBoundaryLayerInletKFvPatchScalarField::map ( const fvPatchScalarField& psf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { inletOutletFvPatchScalarField::map(psf, mapper); diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H index 9efcdbf1eb..a70183cf74 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H @@ -98,7 +98,7 @@ public: const atmBoundaryLayerInletKFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -126,11 +126,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C index 4449124853..3e2fa0c0cc 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "atmBoundaryLayerInletVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -70,7 +70,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField const atmBoundaryLayerInletVelocityFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchVectorField(pvf, p, iF, mapper), @@ -95,7 +95,7 @@ atmBoundaryLayerInletVelocityFvPatchVectorField void atmBoundaryLayerInletVelocityFvPatchVectorField::map ( const fvPatchVectorField& pvf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { inletOutletFvPatchVectorField::map(pvf, mapper); diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H index 38fa203bb6..476be06b25 100644 --- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H +++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H @@ -99,7 +99,7 @@ public: const atmBoundaryLayerInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -127,11 +127,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C index b79749a2b0..02ad9272fc 100644 --- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C +++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "nutkAtmRoughWallFunctionFvPatchScalarField.H" #include "momentumTransportModel.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -100,7 +100,7 @@ nutkAtmRoughWallFunctionFvPatchScalarField const nutkAtmRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), @@ -125,7 +125,7 @@ nutkAtmRoughWallFunctionFvPatchScalarField void nutkAtmRoughWallFunctionFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { nutkWallFunctionFvPatchScalarField::map(ptf, mapper); diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H index b695061079..804859fd97 100644 --- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H +++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H @@ -122,7 +122,7 @@ public: const nutkAtmRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -165,11 +165,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/dynamicMesh/fvMeshAdder/directPointPatchFieldMapper.H b/src/dynamicMesh/fvMeshAdder/directPointPatchFieldMapper.H deleted file mode 100644 index 996a8e2944..0000000000 --- a/src/dynamicMesh/fvMeshAdder/directPointPatchFieldMapper.H +++ /dev/null @@ -1,111 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::directPointPatchFieldMapper - -Description - direct PointPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef directPointPatchFieldMapper_H -#define directPointPatchFieldMapper_H - -#include "pointPatchFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class directPointPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class directPointPatchFieldMapper -: - public generalPointPatchFieldMapper -{ - - //- Addressing from new back to old - const labelUList& directAddressing_; - - //- Does map contain any unmapped values - bool hasUnmapped_; - - -public: - - // Constructors - - //- Construct given addressing - directPointPatchFieldMapper(const labelUList& directAddressing) - : - directAddressing_(directAddressing), - hasUnmapped_(false) - { - if (directAddressing_.size() && min(directAddressing_) < 0) - { - hasUnmapped_ = true; - } - } - - //- Destructor - virtual ~directPointPatchFieldMapper() - {} - - - // Member Functions - - label size() const - { - return directAddressing_.size(); - } - - bool direct() const - { - return true; - } - - bool hasUnmapped() const - { - return hasUnmapped_; - } - - const labelUList& directAddressing() const - { - return directAddressing_; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H index 8837f25c9b..b5e8fe10d3 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ SourceFiles #include "volFieldsFwd.H" #include "fvPatchFieldsFwd.H" #include "fvsPatchFieldsFwd.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "DimensionedField.H" #include "pointFieldsFwd.H" diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C index 911e7d4b29..d52a8c2298 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C @@ -26,10 +26,8 @@ License #include "volFields.H" #include "surfaceFields.H" #include "pointFields.H" -#include "directFvPatchFieldMapper.H" -#include "directPointPatchFieldMapper.H" -#include "reverseFvPatchFieldMapper.H" -#include "reversePointPatchFieldMapper.H" +#include "directFieldMapper.H" +#include "reverseFieldMapper.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -143,9 +141,6 @@ void Foam::fvMeshAdder::MapVolField ) ); - directFvPatchFieldMapper patchMapper(newToOld); - - // Create new patchField with same type as existing one. // Note: // - boundaryField already in new order so access with newPatchi @@ -161,7 +156,7 @@ void Foam::fvMeshAdder::MapVolField bfld[newPatchi], // old field mesh.boundary()[newPatchi], // new fvPatch fld(), // new internal field - patchMapper // mapper (new to old) + directFieldMapper(newToOld) // mapper (new to old) ) ); } @@ -205,8 +200,6 @@ void Foam::fvMeshAdder::MapVolField ) ); - directFvPatchFieldMapper patchMapper(newToAdded); - bfld.set ( newPatchi, @@ -215,7 +208,7 @@ void Foam::fvMeshAdder::MapVolField fldToAdd.boundaryField()[patchi], // added field mesh.boundary()[newPatchi], // new fvPatch fld(), // new int. field - patchMapper // mapper + directFieldMapper(newToAdded) // mapper ) ); } @@ -241,7 +234,7 @@ void Foam::fvMeshAdder::MapVolField bfld[newPatchi].map ( fldToAdd.boundaryField()[patchi], - reverseFvPatchFieldMapper(addedToNew) + reverseFieldMapper(addedToNew) ); } } @@ -439,8 +432,6 @@ void Foam::fvMeshAdder::MapSurfaceField ) ); - directFvPatchFieldMapper patchMapper(newToOld); - // Create new patchField with same type as existing one. // Note: // - boundaryField already in new order so access with newPatchi @@ -456,7 +447,7 @@ void Foam::fvMeshAdder::MapSurfaceField bfld[newPatchi], // old field mesh.boundary()[newPatchi], // new fvPatch fld(), // new internal field - patchMapper // mapper (new to old) + directFieldMapper(newToOld) // mapper (new to old) ) ); } @@ -500,8 +491,6 @@ void Foam::fvMeshAdder::MapSurfaceField ) ); - directFvPatchFieldMapper patchMapper(newToAdded); - bfld.set ( newPatchi, @@ -510,7 +499,7 @@ void Foam::fvMeshAdder::MapSurfaceField fldToAdd.boundaryField()[patchi],// added field mesh.boundary()[newPatchi], // new fvPatch fld(), // new int. field - patchMapper // mapper + directFieldMapper(newToAdded) // mapper ) ); } @@ -536,7 +525,7 @@ void Foam::fvMeshAdder::MapSurfaceField bfld[newPatchi].map ( fldToAdd.boundaryField()[patchi], - reverseFvPatchFieldMapper(addedToNew) + reverseFieldMapper(addedToNew) ); } } @@ -730,8 +719,6 @@ void Foam::fvMeshAdder::MapPointField } } - directPointPatchFieldMapper patchMapper(newToOld); - // Create new patchField with same type as existing one. // Note: // - boundaryField already in new order so access with newPatchi @@ -747,7 +734,7 @@ void Foam::fvMeshAdder::MapPointField bfld[newPatchi], // old field mesh.boundary()[newPatchi], // new pointPatch fld(), // new internal field - patchMapper // mapper (new to old) + directFieldMapper(newToOld) // mapper (new to old) ) ); } @@ -803,8 +790,6 @@ void Foam::fvMeshAdder::MapPointField } } - directPointPatchFieldMapper patchMapper(newToAdded); - bfld.set ( newPatchi, @@ -813,7 +798,7 @@ void Foam::fvMeshAdder::MapPointField fldToAdd.boundaryField()[patchi],// added field mesh.boundary()[newPatchi], // new pointPatch fld(), // new int. field - patchMapper // mapper + directFieldMapper(newToAdded) // mapper ) ); } @@ -838,7 +823,7 @@ void Foam::fvMeshAdder::MapPointField bfld[newPatchi].map ( fldToAdd.boundaryField()[patchi], - reversePointPatchFieldMapper(oldToNew) + reverseFieldMapper(oldToNew) ); } } diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index 381e708924..3965446a30 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,8 +28,7 @@ License #include "internalFvsPatchField.H" #include "internalPointPatchField.H" #include "internalFvPatchFields.H" -#include "directFvPatchFieldMapper.H" -#include "directPointPatchFieldMapper.H" +#include "directFieldMapper.H" #include "flipOp.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -144,7 +143,7 @@ Foam::fvMeshSubset::interpolate vf.boundaryField()[patchMap[patchi]], subPatch, resF(), - directFvPatchFieldMapper(directAddressing) + directFieldMapper(directAddressing) ) ); } @@ -287,7 +286,7 @@ Foam::fvMeshSubset::interpolate sf.boundaryField()[patchMap[patchi]], subPatch, resF(), - directFvPatchFieldMapper(directAddressing) + directFieldMapper(directAddressing) ) ); } @@ -476,7 +475,7 @@ Foam::fvMeshSubset::interpolate pf.boundaryField()[patchMap[patchi]], subPatch, resF(), - directPointPatchFieldMapper(directAddressing) + directFieldMapper(directAddressing) ) ); } diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C index d5cf2e9e1d..f120d63f93 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C @@ -64,7 +64,7 @@ solidBodyMotionDisplacementPointPatchVectorField const solidBodyMotionDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchVectorField(ptf, p, iF, mapper), diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H index 69a94bb6a9..fb5d382ecf 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H @@ -82,7 +82,7 @@ public: const solidBodyMotionDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index d203b8fe23..72c90a0a83 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -125,7 +125,6 @@ $(fvMeshStitchers)/fvMeshStitcher/fvMeshStitcher.C $(fvMeshStitchers)/fvMeshStitcher/fvMeshStitcherNew.C $(fvMeshStitchers)/fvMeshStitcher/fvMeshStitcherTools.C $(fvMeshStitchers)/fvMeshStitcher/conformedFvsPatchFields.C -#$(fvMeshStitchers)/fvMeshStitcher/conformalisingFvPatchFieldMapper.C $(fvMeshStitchers)/stationary/fvMeshStitchersStationary.C functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.C @@ -535,6 +534,5 @@ solver/solver.C solver/solverNew.C fvMeshToFvMesh/fvMeshToFvMesh.C -fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.C LIB = $(FOAM_LIBBIN)/libfiniteVolume diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C index d5b7c01f3e..7729da8135 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.C @@ -49,7 +49,7 @@ MRFFreestreamVelocityFvPatchVectorField const MRFFreestreamVelocityFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : freestreamVelocityFvPatchVectorField(pvf, p, iF, mapper), diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.H index 0cbf597637..09f60a159f 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.H +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFFreestreamVelocity/MRFFreestreamVelocityFvPatchVectorField.H @@ -108,7 +108,7 @@ public: const MRFFreestreamVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C index 265077b6eb..b336900ae5 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.C @@ -58,7 +58,7 @@ Foam::MRFnoSlipFvPatchVectorField::MRFnoSlipFvPatchVectorField const MRFnoSlipFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(pvf, p, iF, mapper), diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.H index 6d9f4039e0..225b9f61f9 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.H +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFnoSlip/MRFnoSlipFvPatchVectorField.H @@ -104,7 +104,7 @@ public: const MRFnoSlipFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C index 2cf6b4fda9..c475fbb82c 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.C @@ -58,7 +58,7 @@ Foam::MRFslipFvPatchVectorField::MRFslipFvPatchVectorField const MRFslipFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(pvf, p, iF, mapper), diff --git a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.H b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.H index ca8d8b0693..21699b5bb3 100644 --- a/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.H +++ b/src/finiteVolume/cfdTools/general/MRF/derivedFvPatchFields/MRFslip/MRFslipFvPatchVectorField.H @@ -103,7 +103,7 @@ public: const MRFslipFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C index 949d8528b2..b710c5571f 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C @@ -59,7 +59,7 @@ Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField const basicSymmetryFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H index 755599af1c..8e1932ac96 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H @@ -79,7 +79,7 @@ public: const basicSymmetryFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C index 2bc9ccda34..462671be77 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "calculatedFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -67,7 +67,7 @@ Foam::calculatedFvPatchField::calculatedFvPatchField const calculatedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H index 040f20aa7f..c5e88080e5 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ public: const calculatedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C index e1c08cb0a7..3da963dd1a 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C @@ -72,7 +72,7 @@ Foam::coupledFvPatchField::coupledFvPatchField const coupledFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H index b36b678a07..52533f16b4 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,7 +93,7 @@ public: const coupledFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C index 730b3a2a44..6b14a579fa 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C @@ -65,7 +65,7 @@ Foam::directionMixedFvPatchField::directionMixedFvPatchField const directionMixedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper), @@ -95,7 +95,7 @@ template void Foam::directionMixedFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { transformFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H index 125372b2a6..ce7af694fb 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H @@ -93,7 +93,7 @@ public: const directionMixedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -138,11 +138,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C index 12a3a93b40..644596d27c 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "extrapolatedCalculatedFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -62,7 +62,7 @@ extrapolatedCalculatedFvPatchField const extrapolatedCalculatedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : calculatedFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H index 8c628ea5d5..7112b19cc2 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,7 +93,7 @@ public: const extrapolatedCalculatedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C index 21e6edd9b9..86f2b31109 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C @@ -75,7 +75,7 @@ Foam::fixedGradientFvPatchField::fixedGradientFvPatchField const fixedGradientFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : @@ -107,7 +107,7 @@ template void Foam::fixedGradientFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H index 3f768d3472..e72d9bd334 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H @@ -115,7 +115,7 @@ public: const fixedGradientFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); @@ -164,11 +164,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C index 641f4c8017..7b80c4f250 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C @@ -57,7 +57,7 @@ Foam::fixedValueFvPatchField::fixedValueFvPatchField const fixedValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H index 55789da5e8..183dd9a645 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ public: const fixedValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C index 819d60ada3..116b0820dd 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C @@ -101,7 +101,7 @@ Foam::mixedFvPatchField::mixedFvPatchField const mixedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : @@ -132,7 +132,7 @@ template void Foam::mixedFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H index 34fcf3d5b2..90a1227881 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H @@ -124,7 +124,7 @@ public: const mixedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); @@ -206,11 +206,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C index de709b478e..cad7b5fb4f 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C @@ -58,7 +58,7 @@ Foam::transformFvPatchField::transformFvPatchField const transformFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H index 2009a541f2..a550455008 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const transformFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C index 54c69f1ee5..ec19aa07f1 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "zeroGradientFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,7 +59,7 @@ Foam::zeroGradientFvPatchField::zeroGradientFvPatchField const zeroGradientFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H index 6fd6cfae53..24870b4b70 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: const zeroGradientFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index 4c1d9379d9..c510eaeb29 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -75,7 +75,7 @@ Foam::cyclicFvPatchField::cyclicFvPatchField const cyclicFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H index 1f02c47af6..f63a4d0667 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ public: const cyclicFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C index c5c50aff96..bf59dd4cbd 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField const cyclicSlipFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H index 6155a8cffc..f49100cac2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ public: const cyclicSlipFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index 643971699a..6f932c7f81 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "emptyFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -70,7 +70,7 @@ Foam::emptyFvPatchField::emptyFvPatchField const emptyFvPatchField&, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& + const fieldMapper& ) : fvPatchField(p, iF, Field(0)) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H index 9c27b240e3..e98a2ffcb8 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H @@ -94,7 +94,7 @@ public: const emptyFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -125,11 +125,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ) + virtual void map(const fvPatchField&, const fieldMapper&) {} //- Reset the fvPatchField to the given fvPatchField diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.C index 16274a7eed..1d2373a4ff 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "internalFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -72,7 +72,7 @@ Foam::internalFvPatchField::internalFvPatchField const internalFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.H index 7716278256..82f66bc88a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/internal/internalFvPatchField.H @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: const internalFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C index a6db40e2fe..65ab11b139 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField const jumpCyclicFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H index 3dfb7f5e9c..4ed12e8df8 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ public: const jumpCyclicFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.C index 027954402f..c8259deb79 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::nonConformalCyclicFvPatchField::nonConformalCyclicFvPatchField const nonConformalCyclicFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.H index a91bf344cf..4056342f4a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,7 +103,7 @@ public: const nonConformalCyclicFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.C index 18dc033fcb..d7c13b8115 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::nonConformalErrorFvPatchField::nonConformalErrorFvPatchField const nonConformalErrorFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.H index c66a98ed73..fda9d018ab 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalError/nonConformalErrorFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ public: const nonConformalErrorFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.C index 6a5c3f58f8..91c818d9d5 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ nonConformalProcessorCyclicFvPatchField const nonConformalProcessorCyclicFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : processorCyclicFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.H index 752459f1c0..0fd71c3c44 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatchField.H @@ -112,7 +112,7 @@ public: const nonConformalProcessorCyclicFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C index fed19dc935..9e1c89c2d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ Foam::processorFvPatchField::processorFvPatchField const processorFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H index dc71ad7cbe..10d84ad0cb 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,7 +125,7 @@ public: const processorFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index 6c45b59269..54643eb9d2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField const processorCyclicFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : processorFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H index c32ba94bcb..e3298a35fa 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H @@ -111,7 +111,7 @@ public: const processorCyclicFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C index d67f05545a..326abec122 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ Foam::symmetryFvPatchField::symmetryFvPatchField const symmetryFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H index 63beb7fa00..37ed37658b 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ public: const symmetryFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C index ca682fee60..e607f7ee5b 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,7 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField const symmetryPlaneFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H index 0cec5fe7e9..0e33adfd14 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,7 +100,7 @@ public: const symmetryPlaneFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index 476eb0f3c1..146e86d2ce 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ Foam::wedgeFvPatchField::wedgeFvPatchField const wedgeFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H index bcbd78517b..09e32ac94c 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ public: const wedgeFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.C index ca45596a18..37e8a66312 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "PrghPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "uniformDimensionedFields.H" @@ -52,7 +52,7 @@ PrghPressureFvPatchScalarField const PrghPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : PressureFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.H index a7568b7a74..8050734ef2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/PrghPressure/PrghPressureFvPatchScalarField.H @@ -95,7 +95,7 @@ public: const PrghPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C index 72c8f342b6..5704677d79 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C @@ -68,7 +68,7 @@ activeBaffleVelocityFvPatchVectorField const activeBaffleVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), @@ -113,7 +113,7 @@ activeBaffleVelocityFvPatchVectorField void Foam::activeBaffleVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H index 306abb7f72..72b2f296f3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H @@ -166,7 +166,7 @@ public: const activeBaffleVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -200,11 +200,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C index 7eb0997523..07129b265c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C @@ -80,7 +80,7 @@ activePressureForceBaffleVelocityFvPatchVectorField const activePressureForceBaffleVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), @@ -131,7 +131,7 @@ activePressureForceBaffleVelocityFvPatchVectorField void Foam::activePressureForceBaffleVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H index f889568621..be4a225470 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H @@ -179,7 +179,7 @@ public: const activePressureForceBaffleVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -217,11 +217,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index db2114cea9..97611fca49 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "advectiveFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "EulerDdtScheme.H" #include "CrankNicolsonDdtScheme.H" @@ -89,7 +89,7 @@ Foam::advectiveFvPatchField::advectiveFvPatchField const advectiveFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H index f1ccabcf74..d34464c779 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H @@ -133,7 +133,7 @@ public: const advectiveFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C index 09f24bdad1..d7519dd423 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C @@ -25,7 +25,7 @@ License #include "codedFixedValueFvPatchField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "dynamicCode.H" #include "dynamicCodeContext.H" @@ -124,7 +124,7 @@ Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField const codedFixedValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H index 6f9f64ea6e..0142b5ed37 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H @@ -138,7 +138,7 @@ public: const codedFixedValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C index 029917e906..5b9b972e49 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "codedMixedFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "dynamicCode.H" #include "dynamicCodeContext.H" @@ -124,7 +124,7 @@ Foam::codedMixedFvPatchField::codedMixedFvPatchField const codedMixedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H index b1a9d39f22..a308f0d00e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H @@ -148,7 +148,7 @@ public: const codedMixedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C index 0d113cabfb..c42c23f153 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "cylindricalInletVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "mathematicalConstants.H" @@ -55,7 +55,7 @@ cylindricalInletVelocityFvPatchVectorField const cylindricalInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H index a4cf5bbc8b..5abfbb0dc6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H @@ -128,7 +128,7 @@ public: const cylindricalInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C index 5b4a650368..6daad19a1e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "dynamicPressureFvPatchScalarField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -142,7 +142,7 @@ Foam::dynamicPressureFvPatchScalarField::dynamicPressureFvPatchScalarField const dynamicPressureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(psf, p, iF, mapper), @@ -172,7 +172,7 @@ Foam::dynamicPressureFvPatchScalarField::dynamicPressureFvPatchScalarField void Foam::dynamicPressureFvPatchScalarField::map ( const fvPatchScalarField& psf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchScalarField::map(psf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.H index 75187cf035..6953e75875 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/dynamicPressure/dynamicPressureFvPatchScalarField.H @@ -111,7 +111,7 @@ public: const dynamicPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -133,11 +133,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.C index db59681982..196b11aff1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.C @@ -49,7 +49,7 @@ entrainmentPressureFvPatchScalarField const entrainmentPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : dynamicPressureFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.H index 1fdba767f4..dfedc80e3b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/entrainmentPressure/entrainmentPressureFvPatchScalarField.H @@ -121,7 +121,7 @@ public: const entrainmentPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index fc982193b2..b9030b43ca 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "externalCoupledMixedFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "IFstream.H" #include "globalIndex.H" @@ -498,7 +498,7 @@ externalCoupledMixedFvPatchField const externalCoupledMixedFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H index ae77659193..bec4947d55 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.H @@ -247,7 +247,7 @@ public: const externalCoupledMixedFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C index 104d98ff10..6dd8343a8a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C @@ -71,7 +71,7 @@ Foam::fanPressureFvPatchScalarField::fanPressureFvPatchScalarField const fanPressureFvPatchScalarField& pfopsf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : totalPressureFvPatchScalarField(pfopsf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H index 3aa6f9ee7f..2206599d9b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H @@ -160,7 +160,7 @@ public: const fanPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C index 1d3f5933ed..26bb38a592 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.C @@ -158,7 +158,7 @@ Foam::fanPressureJumpFvPatchScalarField::fanPressureJumpFvPatchScalarField const fanPressureJumpFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedJumpFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H index 57bd7761ba..ec154730c6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressureJump/fanPressureJumpFvPatchScalarField.H @@ -150,7 +150,7 @@ public: const fanPressureJumpFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C index af155e02e3..5dd86e3b29 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.C @@ -46,7 +46,7 @@ fixedFluxExtrapolatedPressureFvPatchScalarField const fixedFluxExtrapolatedPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedFluxPressureFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H index 1572584461..1e667e122d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H @@ -87,7 +87,7 @@ public: const fixedFluxExtrapolatedPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C index 5a41ab3b21..a3a14f7d21 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "fixedFluxPressureFvPatchScalarField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "addToRunTimeSelectionTable.H" @@ -59,7 +59,7 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField const fixedFluxPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedGradientFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H index 508bc5beab..cec1f20ad5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H @@ -93,7 +93,7 @@ public: const fixedFluxPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C index 8f16c5cef6..00860b71e8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C @@ -46,7 +46,7 @@ Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField const fixedInternalValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.H index 978b6326d1..dd9cd2a795 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.H @@ -95,7 +95,7 @@ public: const fixedInternalValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C index 6d75e16fcb..7e17809d02 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C @@ -75,7 +75,7 @@ Foam::fixedJumpFvPatchField::fixedJumpFvPatchField const fixedJumpFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : jumpCyclicFvPatchField(ptf, p, iF, mapper), @@ -118,7 +118,7 @@ template void Foam::fixedJumpFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { jumpCyclicFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H index 01883b7587..4eb6003547 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.H @@ -121,7 +121,7 @@ public: const fixedJumpFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -161,11 +161,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C index ea04548b26..d5da00ab6e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C @@ -47,7 +47,7 @@ Foam::fixedMeanFvPatchField::fixedMeanFvPatchField const fixedMeanFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H index 89e418267b..9be3f6deaf 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.H @@ -102,7 +102,7 @@ public: const fixedMeanFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C index ebf6bc2d06..868602cd91 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C @@ -59,7 +59,7 @@ Foam::fixedMeanOutletInletFvPatchField::fixedMeanOutletInletFvPatchField const fixedMeanOutletInletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : outletInletFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.H index d8d0ce0966..d3271ceb07 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.H @@ -110,7 +110,7 @@ public: const fixedMeanOutletInletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C index 544044a45f..4ca7c580fb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.C @@ -60,7 +60,7 @@ fixedNormalInletOutletVelocityFvPatchVectorField const fixedNormalInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : directionMixedFvPatchVectorField(ptf, p, iF, mapper), @@ -92,7 +92,7 @@ fixedNormalInletOutletVelocityFvPatchVectorField void Foam::fixedNormalInletOutletVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { directionMixedFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H index 25b79276c3..b7870347e6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalInletOutletVelocity/fixedNormalInletOutletVelocityFvPatchVectorField.H @@ -135,7 +135,7 @@ public: const fixedNormalInletOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -204,11 +204,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C index 37fd2a94f4..a0c985ce8c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C @@ -62,7 +62,7 @@ Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField const fixedNormalSlipFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper), @@ -88,7 +88,7 @@ template void Foam::fixedNormalSlipFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { transformFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H index 904fa6979d..519e51d90b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H @@ -105,7 +105,7 @@ public: const fixedNormalSlipFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -148,11 +148,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C index baafd39599..145a554964 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "fixedPressureCompressibleDensityFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "volFields.H" @@ -50,7 +50,7 @@ fixedPressureCompressibleDensityFvPatchScalarField const fixedPressureCompressibleDensityFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H index eaf1bce5d8..2d791d0a37 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H @@ -117,7 +117,7 @@ public: const fixedPressureCompressibleDensityFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C index 3853b612ae..d631dffb1d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C @@ -76,7 +76,7 @@ Foam::fixedProfileFvPatchField::fixedProfileFvPatchField const fixedProfileFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(p, iF), // Don't map diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H index d48aa840f1..59b03ffd45 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.H @@ -146,7 +146,7 @@ public: const fixedProfileFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.C index 8b7fed3a78..edf1da277b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.C @@ -49,7 +49,7 @@ Foam::fixedValueInletOutletFvPatchField::fixedValueInletOutletFvPatchField const fixedValueInletOutletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.H index 1c43e5016d..fbbabc990c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedValueInletOutlet/fixedValueInletOutletFvPatchField.H @@ -107,7 +107,7 @@ public: const fixedValueInletOutletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index cae04c94d1..ecbcd33836 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C @@ -204,7 +204,7 @@ flowRateInletVelocityFvPatchVectorField const flowRateInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), @@ -250,7 +250,7 @@ flowRateInletVelocityFvPatchVectorField void Foam::flowRateInletVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H index 612d792621..490f18d726 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H @@ -213,7 +213,7 @@ public: const flowRateInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -247,11 +247,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index bbeecf87ff..d74ad118ba 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C @@ -83,7 +83,7 @@ flowRateOutletVelocityFvPatchVectorField const flowRateOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H index f05af41ef0..2b5484aa8a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.H @@ -152,7 +152,7 @@ public: const flowRateOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index bc24918f07..a534aaf475 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "fluxCorrectedVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -53,7 +53,7 @@ fluxCorrectedVelocityFvPatchVectorField const fluxCorrectedVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : zeroGradientFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H index d1ad08f0df..d6f83e36c5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H @@ -125,7 +125,7 @@ public: const fluxCorrectedVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C index 7f0b419b88..883a45025e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C @@ -62,7 +62,7 @@ Foam::freestreamFvPatchField::freestreamFvPatchField const freestreamFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H index 6bd36e8d6b..70d8a90ab9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.H @@ -97,7 +97,7 @@ public: const freestreamFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C index 7f25c5cae0..aa160d59d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C @@ -69,7 +69,7 @@ freestreamPressureFvPatchScalarField const freestreamPressureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(psf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H index 8af68e056a..46677c41df 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H @@ -112,7 +112,7 @@ public: const freestreamPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C index 76e845a666..14406e3914 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.C @@ -61,7 +61,7 @@ Foam::freestreamVelocityFvPatchVectorField::freestreamVelocityFvPatchVectorField const freestreamVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchVectorField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H index 25c002f3ef..8d90e94c5c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamVelocity/freestreamVelocityFvPatchVectorField.H @@ -102,7 +102,7 @@ public: const freestreamVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C index 1487a9dcf8..fd7d8abf7c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C @@ -80,7 +80,7 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField const inletOutletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H index 51dca78c19..023d9850be 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,7 +121,7 @@ public: const inletOutletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C index 4a0c021df1..6826613c7d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "inletOutletTotalTemperatureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -71,7 +71,7 @@ inletOutletTotalTemperatureFvPatchScalarField const inletOutletTotalTemperatureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(ptf, p, iF, mapper), @@ -102,7 +102,7 @@ inletOutletTotalTemperatureFvPatchScalarField void Foam::inletOutletTotalTemperatureFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { inletOutletFvPatchScalarField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H index 8c21961263..447829ffc4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H @@ -119,7 +119,7 @@ public: const inletOutletTotalTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -168,11 +168,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C index b837999811..2d4413cf33 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "interfaceCompressionFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ interfaceCompressionFvPatchScalarField const interfaceCompressionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H index 778ce8f643..e109da8ad0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H @@ -83,7 +83,7 @@ public: const interfaceCompressionFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C index 469d3db7b7..579f5f217f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "interstitialInletVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ interstitialInletVelocityFvPatchVectorField const interstitialInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), @@ -78,7 +78,7 @@ interstitialInletVelocityFvPatchVectorField void Foam::interstitialInletVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H index 8d3f91ab0f..91d1fd22d2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.H @@ -94,7 +94,7 @@ public: const interstitialInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -128,11 +128,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C index 3a6fe9a377..ef9e98622a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "mappedFlowRateVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "mappedPatchBase.H" #include "surfaceFields.H" @@ -61,7 +61,7 @@ mappedFlowRateVelocityFvPatchVectorField const mappedFlowRateVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.H index 8051c72e9b..ab55cd1e24 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRateVelocity/mappedFlowRateVelocityFvPatchVectorField.H @@ -113,7 +113,7 @@ public: const mappedFlowRateVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C index a134ac2a29..eca2cf3c41 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.C @@ -90,7 +90,7 @@ mappedInternalValueFvPatchField const mappedInternalValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), @@ -135,7 +135,7 @@ template void Foam::mappedInternalValueFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.H index c94c43ee57..1e4693555b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedInternalValue/mappedInternalValueFvPatchField.H @@ -137,7 +137,7 @@ public: const mappedInternalValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -171,11 +171,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C index 5180010df7..84eeb6c964 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.C @@ -170,7 +170,7 @@ Foam::mappedValueFvPatchField::mappedValueFvPatchField const mappedValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), @@ -212,7 +212,7 @@ template void Foam::mappedValueFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.H index fd0528fc59..bebd90bcbb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedValue/mappedValueFvPatchField.H @@ -145,7 +145,7 @@ public: const mappedValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -179,11 +179,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C index 0cf1f238ff..ad22f0dd6f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "mappedVelocityFluxFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "mappedPatchBase.H" #include "volFields.H" #include "surfaceFields.H" @@ -57,7 +57,7 @@ Foam::mappedVelocityFluxFvPatchField::mappedVelocityFluxFvPatchField const mappedVelocityFluxFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.H index a8a179c709..18a673212e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFlux/mappedVelocityFluxFvPatchField.H @@ -106,7 +106,7 @@ public: const mappedVelocityFluxFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C index b7e1432e8b..5a9e0a3c6a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C @@ -72,7 +72,7 @@ matchedFlowRateOutletVelocityFvPatchVectorField const matchedFlowRateOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H index 052b3869d3..17e61c495d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.H @@ -120,7 +120,7 @@ public: const matchedFlowRateOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C index f3c61fdb06..6e44f71a0c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ movingWallSlipVelocityFvPatchVectorField const movingWallSlipVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : directionMixedFvPatchVectorField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.H index 59477e4c38..992ad50655 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallSlipVelocity/movingWallSlipVelocityFvPatchVectorField.H @@ -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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: const movingWallSlipVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index cf4c684a4a..9c3e9014d9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C @@ -49,7 +49,7 @@ movingWallVelocityFvPatchVectorField const movingWallVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H index 27d3d741ed..fd476ca8ce 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H @@ -89,7 +89,7 @@ public: const movingWallVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C index 92d27dcf93..9d53b0d3a7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.C @@ -59,7 +59,7 @@ Foam::noSlipFvPatchVectorField::noSlipFvPatchVectorField const noSlipFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper, false) // Don't map diff --git a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H index d30daab1c6..7322f1b376 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/noSlip/noSlipFvPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: const noSlipFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C index fc688741fd..264d34d5e1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C @@ -80,7 +80,7 @@ Foam::outletInletFvPatchField::outletInletFvPatchField const outletInletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H index 9fc55e9089..19c9264661 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.H @@ -124,7 +124,7 @@ public: const outletInletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index da6ba60833..f9e3de17cf 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C @@ -51,7 +51,7 @@ outletMappedUniformInletFvPatchField const outletMappedUniformInletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H index 3013133b61..0db6f8ab11 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H @@ -106,7 +106,7 @@ public: const outletMappedUniformInletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C index b7f6e02596..4c66b211d9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "outletPhaseMeanVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -67,7 +67,7 @@ outletPhaseMeanVelocityFvPatchVectorField const outletPhaseMeanVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H index 41d827564e..5b3280ee10 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H @@ -110,7 +110,7 @@ public: const outletPhaseMeanVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C index 2a626827b8..97cc800a7e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C @@ -61,7 +61,7 @@ Foam::partialSlipFvPatchField::partialSlipFvPatchField const partialSlipFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : transformFvPatchField(ptf, p, iF, mapper), @@ -87,7 +87,7 @@ template void Foam::partialSlipFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { transformFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H index b8ddafda4b..8c8b0240fa 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H @@ -111,7 +111,7 @@ public: const partialSlipFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -151,11 +151,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C index 831663faca..f1819a1351 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "phaseHydrostaticPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "uniformDimensionedFields.H" @@ -71,7 +71,7 @@ phaseHydrostaticPressureFvPatchScalarField const phaseHydrostaticPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H index d5ef89f82d..771fb9467b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H @@ -134,7 +134,7 @@ public: const phaseHydrostaticPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C index 2e55530619..d68981e9d4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "plenumPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -73,7 +73,7 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField const plenumPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.H index ca1f581cdf..81d024ec78 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.H @@ -198,7 +198,7 @@ public: const plenumPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C index e3aae2989c..2faff315dd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "pressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "uniformDimensionedFields.H" @@ -60,7 +60,7 @@ Foam::pressureFvPatchScalarField::pressureFvPatchScalarField const pressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), @@ -84,7 +84,7 @@ Foam::pressureFvPatchScalarField::pressureFvPatchScalarField void Foam::pressureFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchScalarField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.H index d8f9f15187..10b4f30470 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressure/pressureFvPatchScalarField.H @@ -105,7 +105,7 @@ public: const pressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -151,11 +151,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 8f14fba5f6..f1586c299d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "pressureDirectedInletOutletVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -57,7 +57,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField const pressureDirectedInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchVectorField(ptf, p, iF, mapper), @@ -86,7 +86,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H index 283d7d5af1..bc953f7fcb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H @@ -119,7 +119,7 @@ public: const pressureDirectedInletOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -193,11 +193,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index 2c0045bf3c..2ae5139053 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "pressureDirectedInletVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -53,7 +53,7 @@ pressureDirectedInletVelocityFvPatchVectorField const pressureDirectedInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), @@ -82,7 +82,7 @@ pressureDirectedInletVelocityFvPatchVectorField void Foam::pressureDirectedInletVelocityFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H index 48f848e86f..9cb4ec97b4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H @@ -117,7 +117,7 @@ public: const pressureDirectedInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -190,11 +190,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index 6e33aa9151..f6e8487bb5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "pressureInletOutletParSlipVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -56,7 +56,7 @@ pressureInletOutletParSlipVelocityFvPatchVectorField const pressureInletOutletParSlipVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H index 2458046e8f..4df5050e5f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.H @@ -107,7 +107,7 @@ public: const pressureInletOutletParSlipVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Construct from patch, internal field and dictionary diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C index bfdcfc7dce..71f5a43dc3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C @@ -62,7 +62,7 @@ pressureInletOutletVelocityFvPatchVectorField const pressureInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : directionMixedFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H index 32449fbe76..f457f41dcf 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H @@ -121,7 +121,7 @@ public: const pressureInletOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C index b0b21d4a0b..76af76c0d5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C @@ -48,7 +48,7 @@ pressureInletUniformVelocityFvPatchVectorField const pressureInletUniformVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : pressureInletVelocityFvPatchVectorField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H index 212b576599..294941a8aa 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.H @@ -87,7 +87,7 @@ public: const pressureInletUniformVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index d5497be71a..62e48a162a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C @@ -50,7 +50,7 @@ pressureInletVelocityFvPatchVectorField const pressureInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H index db6656744f..f797060a8f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.H @@ -105,7 +105,7 @@ public: const pressureInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 80e1f1a8ea..3d3d069f65 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "pressureNormalInletOutletVelocityFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -56,7 +56,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField const pressureNormalInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H index d959ea71ed..4ebde7bd06 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.H @@ -114,7 +114,7 @@ public: const pressureNormalInletOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C index 238aaed094..558972f4b5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "prghTotalHydrostaticPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "uniformDimensionedFields.H" @@ -54,7 +54,7 @@ prghTotalHydrostaticPressureFvPatchScalarField const prghTotalHydrostaticPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H index 6999706798..39460d6b61 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H @@ -129,7 +129,7 @@ public: const prghTotalHydrostaticPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C index d7f6ebdc11..3d84afe769 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C @@ -72,7 +72,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField const rotatingPressureInletOutletVelocityFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : pressureInletOutletVelocityFvPatchVectorField(pvf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H index 6aaf10fc6c..47fa45372b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.H @@ -134,7 +134,7 @@ public: const rotatingPressureInletOutletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C index 70af960210..8712616d80 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "rotatingTotalPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -52,7 +52,7 @@ rotatingTotalPressureFvPatchScalarField const rotatingTotalPressureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : totalPressureFvPatchScalarField(psf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H index 20b8382e25..e26ead67ac 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.H @@ -125,7 +125,7 @@ public: const rotatingTotalPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C index 9422ca3141..c0fa320e7a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C @@ -64,7 +64,7 @@ rotatingWallVelocityFvPatchVectorField const rotatingWallVelocityFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(pvf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H index 53d3e815ee..eee2a7670e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H @@ -115,7 +115,7 @@ public: const rotatingWallVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C index a481996799..c937761e01 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::slipFvPatchField::slipFvPatchField const slipFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : basicSymmetryFvPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H index 3719fd363c..c07061836b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ public: const slipFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index 40cb6129c7..3312d89fb5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C @@ -25,7 +25,7 @@ License #include "supersonicFreestreamFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -83,7 +83,7 @@ supersonicFreestreamFvPatchVectorField const supersonicFreestreamFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchVectorField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H index bebbef83cd..656035f5f5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H @@ -132,7 +132,7 @@ public: const supersonicFreestreamFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C index 678be04bf8..73ce7beda6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "surfaceNormalFixedValueFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" #include "volFields.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ surfaceNormalFixedValueFvPatchVectorField const surfaceNormalFixedValueFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(p, iF), @@ -83,7 +83,7 @@ surfaceNormalFixedValueFvPatchVectorField void Foam::surfaceNormalFixedValueFvPatchVectorField::map ( const fvPatchVectorField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchVectorField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H index 495b812058..4e938aaaff 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.H @@ -105,7 +105,7 @@ public: const surfaceNormalFixedValueFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -143,11 +143,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchVectorField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchVectorField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C index f36a235179..a60b00f721 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "surfaceNormalUniformFixedValueFvPatchVectorField.H" #include "addToRunTimeSelectionTable.H" #include "volFields.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ surfaceNormalUniformFixedValueFvPatchVectorField const surfaceNormalUniformFixedValueFvPatchVectorField& pvf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchVectorField(pvf, p, iF, mapper, false), // Don't map diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.H index 197f087793..087d58b3b1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.H @@ -105,7 +105,7 @@ public: const surfaceNormalUniformFixedValueFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C index e424bea309..19c370cca8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C @@ -26,7 +26,7 @@ License #include "swirlFlowRateInletVelocityFvPatchVectorField.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "mathematicalConstants.H" @@ -74,7 +74,7 @@ swirlFlowRateInletVelocityFvPatchVectorField const swirlFlowRateInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H index 55dcf00b7f..8af454438f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.H @@ -133,7 +133,7 @@ public: const swirlFlowRateInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C index 0068b6b9e6..a22eaa4faa 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C @@ -51,7 +51,7 @@ swirlInletVelocityFvPatchVectorField const swirlInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H index 04d8482362..50d9458a5f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H @@ -126,7 +126,7 @@ public: const swirlInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index 94e418d1bb..2c1e049666 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C @@ -26,7 +26,7 @@ License #include "syringePressureFvPatchScalarField.H" #include "volMesh.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -63,7 +63,7 @@ Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField const syringePressureFvPatchScalarField& sppsf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(sppsf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.H index b2e4d9c444..ae329509e4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.H @@ -165,7 +165,7 @@ public: const syringePressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index e68627755f..36ffa558c7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C @@ -62,7 +62,7 @@ timeVaryingMappedFixedValueFvPatchField const timeVaryingMappedFixedValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), @@ -89,7 +89,7 @@ template void Foam::timeVaryingMappedFixedValueFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H index 67f8439b79..4d4b11059b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H @@ -145,7 +145,7 @@ public: const timeVaryingMappedFixedValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -179,11 +179,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C index 58f0fee11a..716a13978b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C @@ -386,7 +386,7 @@ template void Foam::timeVaryingMappedFvPatchField::map ( const timeVaryingMappedFvPatchField& tiptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mapper(startSampledValues_, tiptf.startSampledValues_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.H index a089adc4dc..eb620a69eb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.H @@ -220,7 +220,7 @@ public: void map ( const timeVaryingMappedFvPatchField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Reset the fvPatchField to the given fvPatchField diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C index ebd7d84921..7c79a7523f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C @@ -50,7 +50,7 @@ Foam::totalPressureFvPatchScalarField::totalPressureFvPatchScalarField const totalPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : dynamicPressureFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H index 1b767c9b16..8cc42c524b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H @@ -191,7 +191,7 @@ public: const totalPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C index ad7abec494..30c840245a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "totalTemperatureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -64,7 +64,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField const totalTemperatureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), @@ -96,7 +96,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField void Foam::totalTemperatureFvPatchScalarField::map ( const fvPatchScalarField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchScalarField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.H index 3aaae8b10c..ed0abd5aa2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.H @@ -113,7 +113,7 @@ public: const totalTemperatureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -162,11 +162,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C index 00fa036d51..3943473f11 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C @@ -51,7 +51,7 @@ translatingWallVelocityFvPatchVectorField const translatingWallVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H index 274e9e7e99..5819cbf7d2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.H @@ -103,7 +103,7 @@ public: const translatingWallVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C index b3c6a6719c..ecb1297e89 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C @@ -69,7 +69,7 @@ transonicEntrainmentPressureFvPatchScalarField const transonicEntrainmentPressureFvPatchScalarField& psf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(psf, p, iF, mapper), @@ -104,7 +104,7 @@ transonicEntrainmentPressureFvPatchScalarField void Foam::transonicEntrainmentPressureFvPatchScalarField::map ( const fvPatchScalarField& psf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchScalarField::map(psf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.H index 24ac969df5..7cac844d38 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.H @@ -121,7 +121,7 @@ public: const transonicEntrainmentPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -155,11 +155,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchScalarField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchScalarField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C index 3d322d2f4e..d845a02f0b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C @@ -62,7 +62,7 @@ Foam::turbulentInletFvPatchField::turbulentInletFvPatchField const turbulentInletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), @@ -96,7 +96,7 @@ template void Foam::turbulentInletFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValueFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H index 8b7cd7dc8b..1594b7d7ac 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.H @@ -131,7 +131,7 @@ public: const turbulentInletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -192,11 +192,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C index 2e19adc418..a74d714158 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "turbulentIntensityKineticEnergyInletFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceFields.H" #include "volFields.H" @@ -71,7 +71,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : inletOutletFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H index fa4325fe2c..3aa057dc54 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.H @@ -120,7 +120,7 @@ public: const turbulentIntensityKineticEnergyInletFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C index 11d0ed9cd6..d2a3f48de2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "uniformDensityHydrostaticPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "uniformDimensionedFields.H" @@ -66,7 +66,7 @@ uniformDensityHydrostaticPressureFvPatchScalarField const uniformDensityHydrostaticPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H index 7446fa5eaf..f9c95fdae6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H @@ -122,7 +122,7 @@ public: const uniformDensityHydrostaticPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C index 7a011b8223..a5a42d8482 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C @@ -61,7 +61,7 @@ Foam::uniformFixedGradientFvPatchField::uniformFixedGradientFvPatchField const uniformFixedGradientFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedGradientFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H index 8792c2c55b..68d4995f76 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.H @@ -113,7 +113,7 @@ public: const uniformFixedGradientFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C index 966f023fca..1a89fb797e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C @@ -48,7 +48,7 @@ Foam::uniformFixedValueFvPatchField::uniformFixedValueFvPatchField const uniformFixedValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper, false), // Don't map diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H index dbfb04cb22..e44a6c3f19 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.H @@ -104,7 +104,7 @@ public: const uniformFixedValueFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C index 2a9a1bd920..6eaea73ed7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C @@ -66,7 +66,7 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField const uniformInletOutletFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchField(ptf, p, iF, mapper, false), // Don't map @@ -144,7 +144,7 @@ template void Foam::uniformInletOutletFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mixedFvPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H index c5b40958c5..83bd5ec40e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H @@ -117,7 +117,7 @@ public: const uniformInletOutletFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -160,11 +160,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C index 3039fe52b2..1f51a2fc86 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C @@ -63,7 +63,7 @@ Foam::uniformJumpFvPatchField::uniformJumpFvPatchField const uniformJumpFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedJumpFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H index f467305bcd..f01d1ed594 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.H @@ -115,7 +115,7 @@ public: const uniformJumpFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C index 46808cc967..d8b09da22e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "uniformTotalPressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" @@ -68,7 +68,7 @@ uniformTotalPressureFvPatchScalarField const uniformTotalPressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper, false), // Don't map diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H index 5cd3a79b38..0b1c11faf6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H @@ -124,7 +124,7 @@ public: const uniformTotalPressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C index 9b193aaf22..141c413e71 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "variableHeightFlowRateFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "addToRunTimeSelectionTable.H" #include "volFields.H" #include "surfaceFields.H" @@ -69,7 +69,7 @@ variableHeightFlowRateFvPatchScalarField const variableHeightFlowRateFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : mixedFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H index d8c98b4995..496fbccf17 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.H @@ -118,7 +118,7 @@ public: const variableHeightFlowRateFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C index 16a1b03bbf..7d7233e8a9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C @@ -49,7 +49,7 @@ variableHeightFlowRateInletVelocityFvPatchVectorField const variableHeightFlowRateInletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H index 472256ce19..cdb0c5dbad 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.H @@ -117,7 +117,7 @@ public: const variableHeightFlowRateInletVelocityFvPatchVectorField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index a6ddb0102f..1656d3b67a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "waveSurfacePressureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "surfaceFields.H" #include "uniformDimensionedFields.H" @@ -105,7 +105,7 @@ waveSurfacePressureFvPatchScalarField const waveSurfacePressureFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H index a234ae9570..1e9e30dbb1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H @@ -144,7 +144,7 @@ public: const waveSurfacePressureFvPatchScalarField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C index d72971dc46..39feb65e91 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C @@ -25,7 +25,7 @@ License #include "waveTransmissiveFvPatchField.H" #include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volFields.H" #include "EulerDdtScheme.H" #include "CrankNicolsonDdtScheme.H" @@ -53,7 +53,7 @@ Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField const waveTransmissiveFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : advectiveFvPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H index 45c08786ea..7f64d8cf1f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.H @@ -125,7 +125,7 @@ public: const waveTransmissiveFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index 17ea44cbfb..197f68da02 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C @@ -26,7 +26,7 @@ License #include "IOobject.H" #include "dictionary.H" #include "fvMesh.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "volMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -105,7 +105,7 @@ Foam::fvPatchField::fvPatchField const fvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : @@ -186,7 +186,7 @@ template void Foam::fvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mapper(*this, ptf); diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index 4c514cabb8..c2281ccaa8 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -46,6 +46,7 @@ SourceFiles #include "fvPatch.H" #include "DimensionedField.H" +#include "fvPatchFieldMapperFwd.H" #include "fileNameList.H" #include "fieldTypes.H" @@ -58,7 +59,7 @@ namespace Foam class objectRegistry; class dictionary; -class fvPatchFieldMapper; +class fieldMapper; class volMesh; @@ -142,7 +143,7 @@ public: const fvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& m + const fieldMapper& m ), (dynamic_cast(ptf), p, iF, m) ); @@ -193,7 +194,7 @@ public: const fvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); @@ -269,7 +270,7 @@ public: const fvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Return a pointer to a new patchField created on freestore @@ -386,11 +387,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H index 965a784edb..1c8aa69747 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapper.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) 2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,68 +21,13 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Class - Foam::fvPatchFieldMapper - -Description - Foam::fvPatchFieldMapper - \*---------------------------------------------------------------------------*/ #ifndef fvPatchFieldMapper_H #define fvPatchFieldMapper_H -#include "generalFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class fvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class fvPatchFieldMapper -: - virtual public fieldMapper -{ - -public: - - // Constructors - - //- Null constructor - fvPatchFieldMapper() - {} -}; - - -/*---------------------------------------------------------------------------*\ - Class generalFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class generalFvPatchFieldMapper -: - public fvPatchFieldMapper, - public generalFieldMapper -{ - -public: - - // Constructors - - //- Null constructor - generalFvPatchFieldMapper() - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "fieldMapper.H" +#include "fvPatchFieldMapperFwd.H" #endif diff --git a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapperTemplates.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapperFwd.H similarity index 75% rename from src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapperTemplates.C rename to src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapperFwd.H index fcff0a2587..8edbea9200 100644 --- a/src/OpenFOAM/fields/Fields/fieldMappers/identityFieldMapper/identityFieldMapperTemplates.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldMapperFwd.H @@ -21,31 +21,28 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Typedef + Foam::fvPatchFieldMapper + +Description + Backwards compatibility definition for the removal of fvPatchFieldMapper + \*---------------------------------------------------------------------------*/ -#include "identityFieldMapper.H" +#ifndef fvPatchFieldMapperFwd_H +#define fvPatchFieldMapperFwd_H -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template -void Foam::identityFieldMapper::map -( - Field& f, - const Field& mapF -) const +namespace Foam { - f = mapF; + class fieldMapper; + + typedef fieldMapper fvPatchFieldMapper; } +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template -Foam::tmp> Foam::identityFieldMapper::map -( - const Field& mapF -) const -{ - return mapF; -} - +#endif // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C index a8abf1adaf..d213633f34 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C @@ -181,7 +181,7 @@ Foam::tmp> Foam::fvPatchField::New const fvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& pfMapper + const fieldMapper& pfMapper ) { if (debug) diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/reverseFvPatchFieldMapper.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/reverseFvPatchFieldMapper.H deleted file mode 100644 index 8b211502ef..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/reverseFvPatchFieldMapper.H +++ /dev/null @@ -1,105 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::reverseFvPatchFieldMapper - -Description - reverse fvPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef reverseFvPatchFieldMapper_H -#define reverseFvPatchFieldMapper_H - -#include "fvPatchFieldMapper.H" -#include "reverseFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class reverseFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class reverseFvPatchFieldMapper -: - public fvPatchFieldMapper, - public reverseFieldMapper -{ - // Private Data - - //- Addressing from new back to old - const labelUList& addressing_; - - //- Does map contain any unmapped values - bool hasUnmapped_; - - -public: - - // Constructors - - //- Construct given addressing - reverseFvPatchFieldMapper(const labelUList& addressing) - : - addressing_(addressing), - hasUnmapped_(false) - { - if (addressing_.size() && min(addressing_) < 0) - { - hasUnmapped_ = true; - } - } - - - //- Destructor - virtual ~reverseFvPatchFieldMapper() - {} - - - // Member Functions - - virtual bool hasUnmapped() const - { - return hasUnmapped_; - } - - virtual const labelUList& addressing() const - { - return addressing_; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/setSizeFvPatchFieldMapper.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/setSizeFvPatchFieldMapper.H deleted file mode 100644 index 90bafa181b..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/setSizeFvPatchFieldMapper.H +++ /dev/null @@ -1,77 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::setSizeFvPatchFieldMapper - -Description - Set size fvPatchFieldMapper - -\*---------------------------------------------------------------------------*/ - -#ifndef setSizeFvPatchFieldMapper_H -#define setSizeFvPatchFieldMapper_H - -#include "fvPatchFieldMapper.H" -#include "setSizeFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class setSizeFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class setSizeFvPatchFieldMapper -: - public fvPatchFieldMapper, - public setSizeFieldMapper -{ -public: - - // Constructors - - //- Construct - setSizeFvPatchFieldMapper(const label size) - : - setSizeFieldMapper(size) - {} - - - //- Destructor - virtual ~setSizeFvPatchFieldMapper() - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C index bc783c3428..fadce3c706 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "calculatedFvsPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,7 +66,7 @@ Foam::calculatedFvsPatchField::calculatedFvsPatchField const calculatedFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H index dab066334b..92f0827fdb 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H @@ -81,7 +81,7 @@ public: const calculatedFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C index 4af8f1e07b..a40eb5d7a2 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C @@ -68,7 +68,7 @@ Foam::coupledFvsPatchField::coupledFvsPatchField const coupledFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H index 1108a04bba..e8cf9b6a38 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H @@ -90,7 +90,7 @@ public: const coupledFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C index 49f25b6441..ca262c2ba2 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C @@ -56,7 +56,7 @@ Foam::fixedValueFvsPatchField::fixedValueFvsPatchField const fixedValueFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H index f9045a0db1..5a85942410 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H @@ -82,7 +82,7 @@ public: const fixedValueFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C index 8341043a52..d7cc44c0dd 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ Foam::cyclicFvsPatchField::cyclicFvsPatchField const cyclicFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledFvsPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H index 54db3e3e8f..6dce47d515 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,7 @@ public: const cyclicFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C index 5c4784f117..90afe083c4 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField const cyclicSlipFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicFvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H index 2f9ccd8e45..5f684baf2e 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const cyclicSlipFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C index abd36b1e86..0bbb60ae56 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "emptyFvsPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -68,7 +68,7 @@ Foam::emptyFvsPatchField::emptyFvsPatchField const emptyFvsPatchField&, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& + const fieldMapper& ) : fvsPatchField(p, iF, Field(0)) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H index a7056c5ea9..72b11cab44 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H @@ -82,7 +82,7 @@ public: const emptyFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -113,11 +113,7 @@ public: // Mapping functions //- Map the given fvsPatchField onto this fvsPatchField - virtual void map - ( - const fvsPatchField&, - const fvPatchFieldMapper& - ) + virtual void map(const fvsPatchField&, const fieldMapper&) {} //- Reset the fvsPatchField to the given fvsPatchField diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C index b3659adc3f..d7763c41d7 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "internalFvsPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -68,7 +68,7 @@ Foam::internalFvsPatchField::internalFvsPatchField const internalFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.H index 0b613dcde1..450710ce8c 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/internal/internalFvsPatchField.H @@ -83,7 +83,7 @@ public: const internalFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.C index e0a6cd3d13..1c4cfc9572 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nonConformalCyclicFvsPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -69,7 +69,7 @@ Foam::nonConformalCyclicFvsPatchField::nonConformalCyclicFvsPatchField const nonConformalCyclicFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : cyclicFvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.H index af1f3b1fb1..9c13a117d1 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalCyclic/nonConformalCyclicFvsPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ public: const nonConformalCyclicFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting nonConformalCyclic field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C index 66976a5ed8..fd38357e61 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nonConformalErrorFvsPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "surfaceMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -69,7 +69,7 @@ Foam::nonConformalErrorFvsPatchField::nonConformalErrorFvsPatchField const nonConformalErrorFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.H index 56075b9d90..ee45dc0767 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalError/nonConformalErrorFvsPatchField.H @@ -83,7 +83,7 @@ public: const nonConformalErrorFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting nonConformalError field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.C index 812adec611..74e4ba8087 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ nonConformalProcessorCyclicFvsPatchField const nonConformalProcessorCyclicFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : processorCyclicFvsPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.H index fc11940e8f..935711c892 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvsPatchField.H @@ -96,7 +96,7 @@ public: const nonConformalProcessorCyclicFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C index f4de45b08e..e489d129c4 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ Foam::processorFvsPatchField::processorFvsPatchField const processorFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledFvsPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H index cd3950cede..dfea11073f 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: const processorFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C index 6f2bd69a57..a3af72b105 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField const processorCyclicFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : processorFvsPatchField(ptf, p, iF, mapper), diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H index e715064b08..0d8d0af087 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.H @@ -96,7 +96,7 @@ public: const processorCyclicFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C index 7f0c0b3271..5444651a0f 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C @@ -66,7 +66,7 @@ Foam::symmetryFvsPatchField::symmetryFvsPatchField const symmetryFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H index daf80359eb..c86540eeea 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.H @@ -82,7 +82,7 @@ public: const symmetryFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C index f02e67683a..ad9e913926 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C @@ -66,7 +66,7 @@ Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField const symmetryPlaneFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H index bd83480270..8a060d383d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.H @@ -83,7 +83,7 @@ public: const symmetryPlaneFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C index c5121c7368..bdfd669b33 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C @@ -66,7 +66,7 @@ Foam::wedgeFvsPatchField::wedgeFvsPatchField const wedgeFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H index b5a0dfe7cd..3f316a4d70 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.H @@ -82,7 +82,7 @@ public: const wedgeFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.C b/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.C index 65af644539..dff503616e 100644 --- a/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.C +++ b/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nonConformalPolyFacesFvsPatchLabelField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -63,7 +63,7 @@ nonConformalPolyFacesFvsPatchLabelField const nonConformalPolyFacesFvsPatchLabelField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchLabelField(ptf, p, iF, mapper) diff --git a/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.H b/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.H index 9bda602b86..a334b41dfc 100644 --- a/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.H +++ b/src/finiteVolume/fields/fvsPatchFields/derived/nonConformalPolyFaces/nonConformalPolyFacesFvsPatchLabelField.H @@ -77,7 +77,7 @@ public: const nonConformalPolyFacesFvsPatchLabelField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.C b/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.C index 108933e4c0..4b95f67cba 100644 --- a/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.C +++ b/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "polyFacesFvsPatchLabelField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -67,7 +67,7 @@ Foam::polyFacesFvsPatchLabelField::polyFacesFvsPatchLabelField const polyFacesFvsPatchLabelField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchLabelField(ptf, p, iF, mapper, false) diff --git a/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.H b/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.H index a879c345e9..12477a3ab8 100644 --- a/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.H +++ b/src/finiteVolume/fields/fvsPatchFields/derived/polyFaces/polyFacesFvsPatchLabelField.H @@ -84,7 +84,7 @@ public: const polyFacesFvsPatchLabelField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C index beaed967f6..f3695e0400 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C @@ -26,7 +26,7 @@ License #include "IOobject.H" #include "dictionary.H" #include "fvMesh.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -97,7 +97,7 @@ Foam::fvsPatchField::fvsPatchField const fvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper, + const fieldMapper& mapper, const bool mappingRequired ) : @@ -150,7 +150,7 @@ template void Foam::fvsPatchField::map ( const fvsPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { mapper(*this, ptf); diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H index d2f5e5ed85..5b62518ee6 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H @@ -46,6 +46,7 @@ SourceFiles #include "fvPatch.H" #include "DimensionedField.H" +#include "fvPatchFieldMapperFwd.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,7 +57,7 @@ namespace Foam class objectRegistry; class dictionary; -class fvPatchFieldMapper; +class fieldMapper; class surfaceMesh; @@ -139,7 +140,7 @@ public: const fvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& m + const fieldMapper& m ), (dynamic_cast(ptf), p, iF, m) ); @@ -177,7 +178,7 @@ public: const fvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&, + const fieldMapper&, const bool mappingRequired=true ); @@ -263,7 +264,7 @@ public: const fvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Return a pointer to a new patchField created on freestore @@ -383,11 +384,7 @@ public: // Mapping functions //- Map the given fvsPatchField onto this fvsPatchField - virtual void map - ( - const fvsPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvsPatchField&, const fieldMapper&); //- Reset the fvsPatchField to the given fvsPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C index c8f574a030..c200f82eac 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C @@ -174,7 +174,7 @@ Foam::tmp> Foam::fvsPatchField::New const fvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& pfMapper + const fieldMapper& pfMapper ) { if (debug) diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H index afe589ab4a..df2a664046 100644 --- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H +++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H @@ -35,7 +35,7 @@ SourceFiles #ifndef fvPatchMapper_H #define fvPatchMapper_H -#include "fvPatchFieldMapper.H" +#include "generalFieldMapper.H" #include "faceMapper.H" #include "fvPatch.H" #include "primitiveFields.H" @@ -55,7 +55,7 @@ class polyTopoChangeMap; class fvPatchMapper : - public generalFvPatchFieldMapper + public generalFieldMapper { // Private Data diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.C index a91e09c55f..de51cb1bbb 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.C @@ -220,7 +220,7 @@ Foam::conformedFvsPatchField::conformedFvsPatchField const conformedFvsPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fvsPatchField(ptf, p, iF, mapper), @@ -260,7 +260,7 @@ template void Foam::conformedFvsPatchField::map ( const fvsPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { fvsPatchField::map(ptf, mapper); diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H index 505e4df89a..8364a0f959 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H @@ -115,7 +115,7 @@ public: const conformedFvsPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -149,11 +149,7 @@ public: // Mapping functions //- Map the given fvsPatchField onto this fvsPatchField - virtual void map - ( - const fvsPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvsPatchField&, const fieldMapper&); //- Reset the fvsPatchField to the given fvsPatchField // Used for mesh to mesh mapping diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTemplates.C b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTemplates.C index ee3208baeb..8335282dcb 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTemplates.C +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/fvMeshStitcherTemplates.C @@ -29,9 +29,8 @@ Description #include "volFields.H" #include "surfaceFields.H" #include "conformedFvsPatchField.H" -#include "fvPatchFieldMapper.H" #include "fvMeshStitcher.H" -#include "setSizeFvPatchFieldMapper.H" +#include "setSizeFieldMapper.H" #include "nonConformalBoundary.H" #include "nonConformalCyclicFvPatch.H" #include "nonConformalProcessorCyclicFvPatch.H" @@ -55,7 +54,7 @@ void Foam::fvMeshStitcher::resizePatchFields() if (isA(pf.patch())) { - pf.map(pf, setSizeFvPatchFieldMapper(pf.patch().size())); + pf.map(pf, setSizeFieldMapper(pf.patch().size())); } } } diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H index c8dcf0742b..bc9206bd2e 100644 --- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H +++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ SourceFiles #ifndef singleCellFvMesh_H #define singleCellFvMesh_H -#include "fvPatchFieldMapper.H" +#include "generalFieldMapper.H" #include "fvMesh.H" #include "labelListIOList.H" @@ -83,7 +83,7 @@ public: //- Patch field mapper class for agglomerated meshes class agglomPatchFieldMapper : - public generalFvPatchFieldMapper + public generalFieldMapper { // Private Data diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C index e167634a02..1c8dfe79fc 100644 --- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C +++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C @@ -25,7 +25,7 @@ License #include "singleCellFvMesh.H" #include "calculatedFvPatchFields.H" -#include "directFvPatchFieldMapper.H" +#include "directFieldMapper.H" #include "Time.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -135,7 +135,7 @@ tmp> singleCellFvMesh::interpolate vf.boundaryField()[patchi], boundary()[patchi], resF(), - directFvPatchFieldMapper(map) + directFieldMapper(map) ) ); } diff --git a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C index 304c1fd3bb..43c760df4d 100644 --- a/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C +++ b/src/finiteVolume/fvMeshToFvMesh/fvMeshToFvMeshTemplates.C @@ -24,9 +24,10 @@ License \*---------------------------------------------------------------------------*/ #include "fvMeshToFvMesh.H" -#include "directFvPatchFieldMapper.H" -#include "identityFvPatchFieldMapper.H" -#include "patchToPatchFvPatchFieldMapper.H" +#include "directFieldMapper.H" +#include "identityFieldMapper.H" +#include "patchToPatchLeftOverFieldMapper.H" +#include "patchToPatchNormalisedFieldMapper.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -139,7 +140,7 @@ Foam::tmp> Foam::fvMeshToFvMesh::srcToTgt srcFld.boundaryField()[srcPatchi], tgtMesh.boundary()[tgtPatchi], DimensionedField::null(), - directFvPatchFieldMapper + directFieldMapper ( labelList(tgtMesh.boundary()[tgtPatchi].size(), -1) ) @@ -195,7 +196,7 @@ Foam::tmp> Foam::fvMeshToFvMesh::srcToTgt tgtBfld[tgtPatchi].map ( srcFld.boundaryField()[srcPatchi], - patchToPatchNormalisedFvPatchFieldMapper + patchToPatchNormalisedFieldMapper ( patchInterpolation(i), tgtPatchStabilisation(i) @@ -248,12 +249,12 @@ Foam::tmp> Foam::fvMeshToFvMesh::srcToTgt tgtBfld[tgtPatchi].map ( leftOverTgtFld.boundaryField()[tgtPatchi], - identityFvPatchFieldMapper() + identityFieldMapper() ); tgtBfld[tgtPatchi].map ( srcFld.boundaryField()[srcPatchi], - patchToPatchLeftOverFvPatchFieldMapper(patchInterpolation(i)) + patchToPatchLeftOverFieldMapper(patchInterpolation(i)) ); } @@ -337,7 +338,7 @@ Foam::fvMeshToFvMesh::srcToTgt srcBfld[srcPatchi], tgtMesh.boundary()[tgtPatchi], DimensionedField::null(), - patchToPatchNormalisedFvPatchFieldMapper + patchToPatchNormalisedFieldMapper ( patchInterpolation(i), tgtPatchStabilisation(i) diff --git a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.H b/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.H deleted file mode 100644 index ef4d4644e1..0000000000 --- a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.H +++ /dev/null @@ -1,226 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::patchToPatchFvPatchFieldMapper - -Description - FieldMapper which uses a patchToPatch object to map from another patch. The - source patch may be differently decomposed and/or geometrically and - topologically different from the target. - -\*---------------------------------------------------------------------------*/ - -#ifndef patchToPatchFvPatchFieldMapper_H -#define patchToPatchFvPatchFieldMapper_H - -#include "fvPatchFieldMapper.H" -#include "patchToPatch.H" -#include "patchToPatchStabilisation.H" -#include "ListOps.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class patchToPatchFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class patchToPatchFvPatchFieldMapper -: - public fvPatchFieldMapper -{ -protected: - - // Protected Data - - //- Patch-to-patch interpolation engine - const patchToPatch& pToP_; - - -public: - - // Constructors - - //- Construct given a patch-to-patch interpolation - patchToPatchFvPatchFieldMapper(const patchToPatch& pToP) - : - fvPatchFieldMapper(), - pToP_(pToP) - {} - - - //- Destructor - virtual ~patchToPatchFvPatchFieldMapper() - {} - - - // Member Operators - - //- Map a label field (not implemented) - DEFINE_FIELD_MAPPER_OPERATOR(label, ); - - using fvPatchFieldMapper::operator(); - - //- Map a temporary field - template - void operator()(Field& f, const tmp>& tmapF) const; - - //- Map a temporary field - template - tmp> operator()(const tmp>& tmapF) const; -}; - - -/*---------------------------------------------------------------------------*\ - Class patchToPatchLeftOverFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class patchToPatchLeftOverFvPatchFieldMapper -: - public patchToPatchFvPatchFieldMapper -{ - // Private Member Functions - - //- Map from one field to another - template - void map(Field& f, const Field& mapF) const; - - //- Map a field and return the result as tmp - template - tmp> map(const Field& mapF) const; - - -public: - - // Constructors - - //- Inherit base class constructor - using patchToPatchFvPatchFieldMapper::patchToPatchFvPatchFieldMapper; - - - //- Destructor - virtual ~patchToPatchLeftOverFvPatchFieldMapper() - {} - - - // Member Functions - - //- Return whether or not all faces receive a mapped value - virtual bool hasUnmapped() const - { - FatalErrorInFunction - << "Not a valid query for this mapper, which should only be " - << "used for modifying an existing, valid, field" - << exit(FatalError); - return false; - } - - - // Member Operators - - //- Map a field - FOR_ALL_FIELD_TYPES(DEFINE_FIELD_MAPPER_OPERATOR, ); -}; - - -/*---------------------------------------------------------------------------*\ - Class patchToPatchNormalisedFvPatchFieldMapper Declaration -\*---------------------------------------------------------------------------*/ - -class patchToPatchNormalisedFvPatchFieldMapper -: - public patchToPatchFvPatchFieldMapper -{ - // Private Data - - //- Patch stabilisation engine - const patchToPatchStabilisation& pS_; - - - // Private Member Functions - - //- Map from one field to another - template - void map(Field& f, const Field& mapF) const; - - //- Map a field and return the result as tmp - template - tmp> map(const Field& mapF) const; - - -public: - - // Constructors - - //- Construct given a patch-to-patch interpolation and stabilisation - patchToPatchNormalisedFvPatchFieldMapper - ( - const patchToPatch& pToP, - const patchToPatchStabilisation& pS - ) - : - patchToPatchFvPatchFieldMapper(pToP), - pS_(pS) - {} - - - //- Destructor - virtual ~patchToPatchNormalisedFvPatchFieldMapper() - {} - - - // Member Functions - - //- Return whether or not all faces receive a mapped value - virtual bool hasUnmapped() const - { - return false; - } - - - // Member Operators - - //- Map a field - FOR_ALL_FIELD_TYPES(DEFINE_FIELD_MAPPER_OPERATOR, ); -}; - - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "patchToPatchFvPatchFieldMapperTemplates.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapperTemplates.C b/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapperTemplates.C deleted file mode 100644 index 8077051433..0000000000 --- a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapperTemplates.C +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "patchToPatchFvPatchFieldMapper.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template -void Foam::patchToPatchFvPatchFieldMapper::operator() -( - Field& f, - const tmp>& tmapF -) const -{ - operator()(f, tmapF()); - tmapF.clear(); -} - - -template -Foam::tmp> -Foam::patchToPatchFvPatchFieldMapper::operator() -( - const tmp>& tmapF -) const -{ - tmp> tf(operator()(tmapF())); - tmapF.clear(); - return tf; -} - - -template -void Foam::patchToPatchLeftOverFvPatchFieldMapper::map -( - Field& f, - const Field& mapF -) const -{ - f = pToP_.srcToTgt(mapF, f); -} - - -template -Foam::tmp> -Foam::patchToPatchLeftOverFvPatchFieldMapper::map -( - const Field& mapF -) const -{ - FatalErrorInFunction - << "Not a valid operation for this mapper, which should only be " - << "used for modifying an existing, valid, field" - << exit(FatalError); - return tmp>(nullptr); -} - - -template -void Foam::patchToPatchNormalisedFvPatchFieldMapper::map -( - Field& f, - const Field& mapF -) const -{ - f = pToP_.srcToTgt(mapF); - - pS_.stabilise(f); -} - - -template -Foam::tmp> -Foam::patchToPatchNormalisedFvPatchFieldMapper::map -( - const Field& mapF -) const -{ - tmp> tf(new Field()); - map(tf.ref(), mapF); - return tf; -} - - -// ************************************************************************* // diff --git a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C index 80a57c645b..23a2fb0a84 100644 --- a/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C +++ b/src/fvMeshStitchers/moving/fvMeshStitchersMoving.C @@ -1074,7 +1074,7 @@ void Foam::fvMeshStitchers::moving::unconformCorrectMeshPhi phi0Bf[ncPatchi].map ( phi0Bf[ncPatchi], - setSizeFvPatchFieldMapper(polyFacesBf[ncPatchi].size()) + setSizeFieldMapper(polyFacesBf[ncPatchi].size()) ); } } diff --git a/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H b/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H index 9964dcd330..3e2ed6544c 100644 --- a/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H +++ b/src/fvMeshTopoChangers/meshToMesh/MeshToMeshMapGeometricFields.H @@ -36,8 +36,7 @@ Description #include "polyMesh.H" #include "fvMeshToFvMesh.H" -#include "fvPatchFieldMapper.H" -#include "pointPatchFieldMapper.H" +#include "fieldMapper.H" #include "setSizeFieldMapper.H" #include "processorPolyPatch.H" @@ -104,13 +103,7 @@ void MeshToMeshMapVolInternalFields } -template -< - class Type, - template class PatchField, - class GeoMesh, - class SetSizePatchFieldMapper -> +template class PatchField, class GeoMesh> void NaNGeometricFields ( const fvMesh& mesh, @@ -166,7 +159,7 @@ void NaNGeometricFields else { typename GField::Patch& pf = field.boundaryFieldRef()[patchi]; - pf.map(pf, SetSizePatchFieldMapper(pf.patch().size())); + pf.map(pf, setSizeFieldMapper(pf.patch().size())); } field.boundaryFieldRef()[patchi] == NaN; diff --git a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C index fe1011b738..2b1a139104 100644 --- a/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C +++ b/src/fvMeshTopoChangers/meshToMesh/fvMeshTopoChangersMeshToMesh.C @@ -35,8 +35,7 @@ License #include "MeshToMeshMapGeometricFields.H" #include "polyMeshMap.H" #include "processorPolyPatch.H" -#include "setSizeFvPatchFieldMapper.H" -#include "setSizePointPatchFieldMapper.H" +#include "setSizeFieldMapper.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -275,14 +274,14 @@ bool Foam::fvMeshTopoChangers::meshToMesh::update() // Set all the surfaceFields in the objectRegistry to NaN #define NaNSurfaceFieldType(Type, nullArg) \ NaNGeometricFields \ - \ + \ (mesh(), mapper); FOR_ALL_FIELD_TYPES(NaNSurfaceFieldType); // Set all the pointFields in the objectRegistry to NaN #define NaNPointFieldType(Type, nullArg) \ NaNGeometricFields \ - \ + \ (mesh(), mapper); FOR_ALL_FIELD_TYPES(NaNPointFieldType); diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C index bc4c970c90..f1eed0838f 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ Foam::cellMotionFvPatchField::cellMotionFvPatchField const cellMotionFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValueFvPatchField(ptf, p, iF, mapper) diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H index 7ea571db0b..40681d8a9d 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.H +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ public: const cellMotionFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H index 6248acedde..228eb5d181 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.H +++ b/src/fvMotionSolver/fvPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementFvPatchField.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-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ public: const surfaceSlipDisplacementFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : slipFvPatchField(ptf, p, iF, mapper) diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C index 81e8f2612a..1fc6e6739f 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C @@ -73,7 +73,7 @@ angularOscillatingDisplacementPointPatchVectorField const angularOscillatingDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), @@ -108,7 +108,7 @@ angularOscillatingDisplacementPointPatchVectorField void angularOscillatingDisplacementPointPatchVectorField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { const angularOscillatingDisplacementPointPatchVectorField& aODptf = diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H index fe08ae31de..1b4b0d15f7 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H @@ -35,6 +35,7 @@ SourceFiles #ifndef angularOscillatingDisplacementPointPatchVectorField_H #define angularOscillatingDisplacementPointPatchVectorField_H +#include "pointPatchFields.H" #include "fixedValuePointPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,7 +86,7 @@ public: const angularOscillatingDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -117,11 +118,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchVectorField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C index 205646c6bb..206fa3d714 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C @@ -73,7 +73,7 @@ angularOscillatingVelocityPointPatchVectorField const angularOscillatingVelocityPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), @@ -108,7 +108,7 @@ angularOscillatingVelocityPointPatchVectorField void angularOscillatingVelocityPointPatchVectorField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { const angularOscillatingVelocityPointPatchVectorField& aOVptf = diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H index 56b6d2ac57..d277b22c69 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H @@ -35,6 +35,7 @@ SourceFiles #ifndef angularOscillatingVelocityPointPatchVectorField_H #define angularOscillatingVelocityPointPatchVectorField_H +#include "pointPatchFields.H" #include "fixedValuePointPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,7 +86,7 @@ public: const angularOscillatingVelocityPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -117,11 +118,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchVectorField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C index 88acec3fed..3777adf023 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C @@ -61,7 +61,7 @@ oscillatingDisplacementPointPatchVectorField const oscillatingDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H index b2d6bab068..c8d38799b9 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H @@ -78,7 +78,7 @@ public: const oscillatingDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C index 4e1a7e8d2a..d9c8c52002 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C @@ -70,7 +70,7 @@ oscillatingVelocityPointPatchVectorField const oscillatingVelocityPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), @@ -99,7 +99,7 @@ oscillatingVelocityPointPatchVectorField void oscillatingVelocityPointPatchVectorField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { const oscillatingVelocityPointPatchVectorField& oVptf = diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H index daacbee3e4..94e4026d21 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H @@ -35,6 +35,7 @@ SourceFiles #ifndef oscillatingVelocityPointPatchVectorField_H #define oscillatingVelocityPointPatchVectorField_H +#include "pointPatchFields.H" #include "fixedValuePointPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -82,7 +83,7 @@ public: const oscillatingVelocityPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -114,11 +115,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchVectorField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C index fcb1f81d38..e28691afcc 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C @@ -337,7 +337,7 @@ surfaceDisplacementPointPatchVectorField const surfaceDisplacementPointPatchVectorField& ppf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchVectorField(ppf, p, iF, mapper), diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H index 2187a711ba..b54d4ce1f8 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H @@ -143,7 +143,7 @@ public: const surfaceDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C index 33e9793d8f..e7a63e2fc8 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C @@ -326,7 +326,7 @@ surfaceSlipDisplacementPointPatchVectorField const surfaceSlipDisplacementPointPatchVectorField& ppf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& + const fieldMapper& ) : pointPatchVectorField(p, iF), diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H index dfe0b6deb3..f270a328dc 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H @@ -134,7 +134,7 @@ public: const surfaceSlipDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C index 93342c880c..a6b4773d28 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C @@ -106,7 +106,7 @@ timeVaryingMappedFixedValuePointPatchField const timeVaryingMappedFixedValuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), @@ -157,7 +157,7 @@ template void Foam::timeVaryingMappedFixedValuePointPatchField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { fixedValuePointPatchField::map(ptf, mapper); diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H index c9da29eae9..78344ff88e 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H @@ -123,7 +123,7 @@ public: const timeVaryingMappedFixedValuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -163,11 +163,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C index a4433d6039..5e11c91b06 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C @@ -56,7 +56,7 @@ uniformInterpolatedDisplacementPointPatchVectorField const uniformInterpolatedDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper) diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H index 085272af85..377207e97c 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H @@ -98,7 +98,7 @@ public: const uniformInterpolatedDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C index 5cb13f3f68..d46382aada 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C @@ -85,7 +85,7 @@ waveDisplacementPointPatchVectorField const waveDisplacementPointPatchVectorField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper), diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H index 27f88efa59..53cdef8be9 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H @@ -133,7 +133,7 @@ public: const waveDisplacementPointPatchVectorField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/generic/genericFields/genericPointPatchField/genericPointPatchField.C b/src/generic/genericFields/genericPointPatchField/genericPointPatchField.C index 283b5480cc..5f28def40c 100644 --- a/src/generic/genericFields/genericPointPatchField/genericPointPatchField.C +++ b/src/generic/genericFields/genericPointPatchField/genericPointPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "genericPointPatchField.H" -#include "pointPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -141,7 +141,7 @@ Foam::genericPointPatchField::genericPointPatchField const genericPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : genericFieldBase(ptf), @@ -186,7 +186,7 @@ template void Foam::genericPointPatchField::map ( const pointPatchField& ptf, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) { const genericPointPatchField& dptf = diff --git a/src/generic/genericFields/genericPointPatchField/genericPointPatchField.H b/src/generic/genericFields/genericPointPatchField/genericPointPatchField.H index c9a3beb900..7062f82f06 100644 --- a/src/generic/genericFields/genericPointPatchField/genericPointPatchField.H +++ b/src/generic/genericFields/genericPointPatchField/genericPointPatchField.H @@ -94,7 +94,7 @@ public: const genericPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference @@ -126,11 +126,7 @@ public: // Mapping functions //- Map the given pointPatchField onto this pointPatchField - virtual void map - ( - const pointPatchField&, - const pointPatchFieldMapper& - ); + virtual void map(const pointPatchField&, const fieldMapper&); //- Reset the pointPatchField to the given pointPatchField // Used for mesh to mesh mapping diff --git a/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.C b/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.C index a589e43ed4..215fec04f0 100644 --- a/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.C +++ b/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "genericFvPatchField.H" -#include "fvPatchFieldMapper.H" +#include "fieldMapper.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -264,7 +264,7 @@ Foam::genericFvPatchField::genericFvPatchField const genericFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) : genericFieldBase(ptf), @@ -309,7 +309,7 @@ template void Foam::genericFvPatchField::map ( const fvPatchField& ptf, - const fvPatchFieldMapper& mapper + const fieldMapper& mapper ) { calculatedFvPatchField::map(ptf, mapper); diff --git a/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.H b/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.H index c1fa5e4da7..3879a6bfe6 100644 --- a/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.H +++ b/src/generic/genericFvFields/genericFvPatchField/genericFvPatchField.H @@ -94,7 +94,7 @@ public: const genericFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -125,11 +125,7 @@ public: // Mapping functions //- Map the given fvPatchField onto this fvPatchField - virtual void map - ( - const fvPatchField&, - const fvPatchFieldMapper& - ); + virtual void map(const fvPatchField&, const fieldMapper&); //- Reset the fvPatchField to the given fvPatchField // Used for mesh to mesh mapping diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C index 1e76b70e33..f436de0428 100644 --- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C +++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C @@ -29,8 +29,8 @@ License #include "ListOps.H" #include "ListListOps.H" #include "nonConformalFvPatch.H" -#include "fvPatchFieldMapper.H" -#include "setSizeFvPatchFieldMapper.H" +#include "fieldMapper.H" +#include "setSizeFieldMapper.H" // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // @@ -246,7 +246,7 @@ void Foam::PatchCollisionDensity::preEvolve() if (isA(fvp)) { - const setSizeFvPatchFieldMapper mapper(fvp.size()); + const setSizeFieldMapper mapper(fvp.size()); numberCollisionDensity_[patchi].map ( diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C index 79efad23e3..913a158093 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ zeroFixedValuePointPatchField const zeroFixedValuePointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : fixedValuePointPatchField(ptf, p, iF, mapper) diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H index e0d34c27bf..e0b9fc290b 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ public: const zeroFixedValuePointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Disallow copy without setting internal field reference @@ -105,7 +105,6 @@ public: const DimensionedField& ); - //- Construct and return a clone setting internal field reference virtual autoPtr> clone ( @@ -121,7 +120,6 @@ public: ) ); } - }; diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index d5362c15c0..8eee4b5987 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -215,6 +215,10 @@ patchToPatch/rays/raysPatchToPatch.C patchToPatch/patchToPatchStabilisation/patchToPatchStabilisation.C +patchToPatchFieldMapper/patchToPatchFieldMapper.C +patchToPatchFieldMapper/patchToPatchLeftOverFieldMapper.C +patchToPatchFieldMapper/patchToPatchNormalisedFieldMapper.C + cellsToCells/cellsToCells/cellsToCells.C cellsToCells/cellsToCells/cellsToCellsParallelOps.C cellsToCells/matching/matchingCellsToCells.C diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.C index 0d6dbc6efd..7991ec9243 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ Foam::nonConformalCyclicPointPatchField::nonConformalCyclicPointPatchField const nonConformalCyclicPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.H b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.H index 7ae47f83d8..301b96b732 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.H +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const nonConformalCyclicPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting nonConformalCyclic field reference diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.C index 47c1bf4695..9bf63f8d77 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ Foam::nonConformalErrorPointPatchField::nonConformalErrorPointPatchField const nonConformalErrorPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : pointPatchField(ptf, p, iF, mapper) diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.H b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.H index 5f1d68afa9..65c1151c1d 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.H +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: const nonConformalErrorPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting nonConformalError field reference diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.C index 666cf641a2..ebf73510c0 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.C @@ -62,7 +62,7 @@ nonConformalProcessorCyclicPointPatchField const nonConformalProcessorCyclicPointPatchField& ptf, const pointPatch& p, const DimensionedField& iF, - const pointPatchFieldMapper& mapper + const fieldMapper& mapper ) : coupledPointPatchField(ptf, p, iF, mapper), diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.H b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.H index 58363cb2cb..0ca3114601 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.H +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchField.H @@ -88,7 +88,7 @@ public: const nonConformalProcessorCyclicPointPatchField&, const pointPatch&, const DimensionedField&, - const pointPatchFieldMapper& + const fieldMapper& ); //- Construct as copy setting internal field reference diff --git a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.C b/src/meshTools/patchToPatchFieldMapper/patchToPatchFieldMapper.C similarity index 78% rename from src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.C rename to src/meshTools/patchToPatchFieldMapper/patchToPatchFieldMapper.C index d369946497..978663d118 100644 --- a/src/finiteVolume/fvMeshToFvMesh/patchToPatchFvPatchFieldMapper.C +++ b/src/meshTools/patchToPatchFieldMapper/patchToPatchFieldMapper.C @@ -23,11 +23,11 @@ License \*---------------------------------------------------------------------------*/ -#include "patchToPatchFvPatchFieldMapper.H" +#include "patchToPatchFieldMapper.H" -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::patchToPatchFvPatchFieldMapper::operator() +void Foam::patchToPatchFieldMapper::operator() ( Field