From 7592a81c6ecb3f9d253c4762d34720edcc3c31e8 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 4 Apr 2022 11:15:41 +0100 Subject: [PATCH] polyMeshMap: New mesh to mesh map for the new mapping update function mapMesh(const polyMeshMap&) This new mapping structure is designed to support run-time mesh-to-mesh mapping to allow arbitrary changes to the mesh structure, for example during extreme motion requiring significant topology change including region disconnection etc. --- .../VoFClouds/VoFClouds.C | 6 +- .../VoFClouds/VoFClouds.H | 7 +- .../VoFSolidificationMeltingSource.C | 10 +- .../VoFSolidificationMeltingSource.H | 7 +- .../VoFSurfaceFilm/VoFSurfaceFilm.C | 8 +- .../VoFSurfaceFilm/VoFSurfaceFilm.H | 7 +- .../VoFTurbulenceDamping.C | 6 +- .../VoFTurbulenceDamping.H | 7 +- .../VoFTurbulenceDamping.C | 6 +- .../VoFTurbulenceDamping.H | 7 +- .../interfaceTurbulenceDamping.C | 6 +- .../interfaceTurbulenceDamping.H | 7 +- .../phaseTurbulenceStabilisation.C | 6 +- .../phaseTurbulenceStabilisation.H | 7 +- .../test/fieldMapping/Test-fieldMapping.C | 4 +- applications/test/hexRef8/Test-hexRef8.C | 4 +- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 2 +- .../advanced/autoRefineMesh/autoRefineMesh.C | 4 +- .../combinePatchFaces/combinePatchFaces.C | 6 +- .../mesh/advanced/modifyMesh/cellSplitter.C | 2 +- .../mesh/advanced/modifyMesh/cellSplitter.H | 2 +- .../mesh/advanced/modifyMesh/modifyMesh.C | 6 +- .../advanced/refineHexMesh/refineHexMesh.C | 4 +- .../refineWallLayer/refineWallLayer.C | 2 +- .../mesh/advanced/removeFaces/removeFaces.C | 4 +- .../mesh/advanced/splitCells/splitCells.C | 4 +- .../extrude/extrudeMesh/extrudeMesh.C | 8 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 4 +- .../generation/extrude2DMesh/extrude2DMesh.C | 4 +- .../extrude2DMesh/extrude2DMesh.H | 2 +- .../backgroundMeshDecomposition.C | 14 +- .../foamyMesh/foamyQuadMesh/foamyQuadMesh.C | 2 +- .../createBaffles/createBaffles.C | 2 +- .../manipulation/mergeBaffles/mergeBaffles.C | 2 +- .../mesh/manipulation/mirrorMesh/mirrorMesh.C | 2 +- .../manipulation/polyDualMesh/polyDualMesh.C | 2 +- .../manipulation/renumberMesh/renumberMesh.C | 8 +- .../manipulation/splitBaffles/splitBaffles.C | 4 +- .../splitMeshRegions/splitMeshRegions.C | 2 +- .../graphics/PVReaders/vtkPVFoam/vtkPVFoam.C | 6 +- .../graphics/PVReaders/vtkPVFoam/vtkPVFoam.H | 4 +- .../dynamicCode/codedFvModelTemplate.C | 24 +- .../dynamicCode/codedFvModelTemplate.H | 13 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 60 +- .../LES/LESdeltas/smoothDelta/smoothDelta.H | 53 +- .../smoothDelta/smoothDeltaDeltaDataI.H | 22 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.C | 18 +- src/OpenFOAM/Make/files | 3 + .../IOOutputFilter/IOOutputFilter.C | 33 +- .../IOOutputFilter/IOOutputFilter.H | 12 +- .../functionObject/functionObject.C | 12 +- .../functionObject/functionObject.H | 12 +- .../functionObjectList/functionObjectList.C | 36 +- .../functionObjectList/functionObjectList.H | 14 +- .../timeControl/timeControlFunctionObject.C | 37 +- .../timeControl/timeControlFunctionObject.H | 11 +- src/OpenFOAM/meshes/MeshObject/MeshObject.C | 52 +- src/OpenFOAM/meshes/MeshObject/MeshObject.H | 14 +- .../pointBoundaryMesh/pointBoundaryMesh.C | 14 +- .../pointBoundaryMesh/pointBoundaryMesh.H | 6 +- src/OpenFOAM/meshes/pointMesh/pointMesh.C | 60 +- src/OpenFOAM/meshes/pointMesh/pointMesh.H | 11 +- .../basic/coupled/coupledPointPatch.H | 6 +- .../constraint/cyclic/cyclicPointPatch.C | 10 +- .../constraint/cyclic/cyclicPointPatch.H | 6 +- .../processor/processorPointPatch.C | 10 +- .../processor/processorPointPatch.H | 6 +- .../facePointPatch/facePointPatch.C | 6 +- .../facePointPatch/facePointPatch.H | 6 +- .../pointPatches/pointPatch/pointPatch.H | 6 +- .../polyMesh/globalMeshData/globalMeshData.C | 4 +- .../polyMesh/globalMeshData/globalMeshData.H | 2 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 16 +- .../polyBoundaryMesh/polyBoundaryMesh.H | 8 +- .../polyDistributionMap/distributionMap.H | 10 +- .../polyDistributionMap/distributionMapBase.H | 8 - .../lagrangianDistributionMap.H | 8 - .../polyDistributionMap/polyDistributionMap.H | 9 - src/OpenFOAM/meshes/polyMesh/polyMesh.C | 10 +- src/OpenFOAM/meshes/polyMesh/polyMesh.H | 8 +- src/OpenFOAM/meshes/polyMesh/polyMeshClear.C | 4 +- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 4 +- src/OpenFOAM/meshes/polyMesh/polyMeshIO.C | 4 +- .../meshes/polyMesh/polyMeshMap/polyMeshMap.C | 34 + .../meshes/polyMesh/polyMeshMap/polyMeshMap.H | 77 ++ src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C | 19 +- .../basic/coupled/coupledPolyPatch.H | 6 +- .../constraint/cyclic/cyclicPolyPatch.C | 10 +- .../constraint/cyclic/cyclicPolyPatch.H | 6 +- .../constraint/processor/processorPolyPatch.C | 10 +- .../constraint/processor/processorPolyPatch.H | 6 +- .../processorCyclicPolyPatch.C | 8 +- .../processorCyclicPolyPatch.H | 4 +- .../polyPatches/polyPatch/polyPatch.C | 4 +- .../polyPatches/polyPatch/polyPatch.H | 6 +- .../polyTopoChangeMap/mapAddedPolyMesh.H | 2 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 9 +- .../meshes/polyMesh/zones/faceZone/faceZone.H | 8 +- src/dynamicMesh/attachDetach/attachDetach.C | 2 +- src/dynamicMesh/attachDetach/attachDetach.H | 2 +- .../createShellMesh/createShellMesh.C | 2 +- .../createShellMesh/createShellMesh.H | 2 +- .../extrudePatchMesh/extrudePatchMesh.C | 2 +- .../fvMeshDistribute/fvMeshDistribute.C | 10 +- .../layerAdditionRemoval.C | 4 +- .../layerAdditionRemoval.H | 2 +- .../boundaryCutter/boundaryCutter.C | 2 +- .../boundaryCutter/boundaryCutter.H | 2 +- .../meshCutAndRemove/meshCutAndRemove.C | 6 +- .../meshCutAndRemove/meshCutAndRemove.H | 2 +- .../meshModifiers/meshCutter/meshCutter.C | 8 +- .../meshModifiers/meshCutter/meshCutter.H | 2 +- .../multiDirRefinement/multiDirRefinement.C | 2 +- .../refinementIterator/refinementIterator.C | 4 +- .../undoableMeshCutter/undoableMeshCutter.C | 6 +- .../undoableMeshCutter/undoableMeshCutter.H | 4 +- .../motionSmoother/motionSmootherAlgo.C | 4 +- .../motionSmoother/motionSmootherAlgo.H | 4 +- .../componentDisplacementMotionSolver.C | 9 +- .../componentDisplacementMotionSolver.H | 5 +- .../componentVelocityMotionSolver.C | 11 +- .../componentVelocityMotionSolver.H | 5 +- .../displacement/displacementMotionSolver.C | 11 +- .../displacement/displacementMotionSolver.H | 5 +- .../displacementLayeredMotionMotionSolver.C | 4 +- .../displacementLayeredMotionMotionSolver.H | 2 +- .../points0/points0MotionSolver.C | 8 +- .../points0/points0MotionSolver.H | 5 +- .../solidBodyMotionSolver.C | 2 +- .../solidBodyMotionSolver.H | 4 +- .../motionSolvers/motionSolver/motionSolver.C | 4 +- .../motionSolvers/motionSolver/motionSolver.H | 9 +- .../motionSolverList/motionSolverList.C | 18 +- .../motionSolverList/motionSolverList.H | 5 +- .../velocity/velocityMotionSolver.C | 8 +- .../velocity/velocityMotionSolver.H | 5 +- .../perfectInterface/perfectInterface.C | 2 +- .../perfectInterface/perfectInterface.H | 2 +- .../polyMeshFilter/polyMeshFilter.C | 6 +- .../polyMeshFilter/polyMeshFilterTemplates.C | 4 +- .../polyMeshModifier/polyMeshModifier.H | 2 +- .../polyTopoChange/addPatchCellLayer.C | 2 +- .../polyTopoChange/addPatchCellLayer.H | 2 +- .../polyTopoChange/combineFaces.C | 2 +- .../polyTopoChange/combineFaces.H | 2 +- .../polyTopoChange/duplicatePoints.C | 2 +- .../polyTopoChange/duplicatePoints.H | 2 +- .../polyTopoChange/faceCollapser.H | 2 +- .../polyTopoChange/hexRef8/hexRef8.C | 18 +- .../polyTopoChange/hexRef8/hexRef8.H | 4 +- .../polyTopoChange/hexRef8/hexRef8Data.C | 4 +- .../polyTopoChange/hexRef8/hexRef8Data.H | 2 +- .../hexRef8/refinementHistory.C | 6 +- .../hexRef8/refinementHistory.H | 2 +- .../polyTopoChange/removeCells.H | 2 +- .../polyTopoChange/removeFaces.H | 2 +- .../polyTopoChange/removePoints.C | 2 +- .../polyTopoChange/removePoints.H | 2 +- .../polyTopoChange/tetDecomposer.C | 2 +- .../polyTopoChange/tetDecomposer.H | 2 +- .../polyTopoChanger/polyTopoChanger.C | 4 +- src/dynamicMesh/setUpdater/setUpdater.C | 4 +- src/dynamicMesh/setUpdater/setUpdater.H | 2 +- .../setUpdater/setUpdaterTemplates.C | 4 +- .../slidingInterface/slidingInterface.C | 4 +- .../slidingInterface/slidingInterface.H | 2 +- src/finiteVolume/Make/files | 6 +- .../FvFaceCellWave/FvFaceCellWave.C | 1067 +++++++++++++++++ .../FvFaceCellWave/FvFaceCellWave.H | 374 ++++++ .../FvFaceCellWave/FvFaceCellWaveName.C | 36 + .../cfdTools/general/MRF/MRFZone.H | 10 - .../general/fvConstraints/fvConstraint.H | 14 +- .../general/fvConstraints/fvConstraints.C | 55 +- .../general/fvConstraints/fvConstraints.H | 13 +- .../cfdTools/general/fvModels/fvModel.H | 14 +- .../cfdTools/general/fvModels/fvModels.C | 55 +- .../cfdTools/general/fvModels/fvModels.H | 13 +- .../finiteVolume/fvc/fvcSmooth/fvcSmooth.C | 166 +-- .../finiteVolume/fvc/fvcSmooth/fvcSmooth.H | 4 +- .../finiteVolume/fvc/fvcSmooth/smoothData.H | 34 +- .../finiteVolume/fvc/fvcSmooth/smoothDataI.H | 37 +- .../finiteVolume/fvc/fvcSmooth/sweepData.H | 45 +- .../finiteVolume/fvc/fvcSmooth/sweepDataI.H | 49 +- src/finiteVolume/fvMesh/fvCellSet/fvCellSet.C | 29 +- src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H | 14 +- src/finiteVolume/fvMesh/fvMesh.C | 41 +- src/finiteVolume/fvMesh/fvMesh.H | 5 +- .../fvMeshDistributor/fvMeshDistributor.H | 5 +- .../none/fvMeshDistributorsNone.H | 6 +- .../fvMeshMovers/fvMeshMover/fvMeshMover.H | 5 +- .../fvMeshMovers/none/fvMeshMoversNone.H | 6 +- .../fvMeshTopoChanger/fvMeshTopoChanger.H | 5 +- .../none/fvMeshTopoChangersNone.H | 6 +- .../fvPatchDistWave/fvPatchDistWave.H | 122 ++ .../fvPatchDistWaveTemplates.C | 329 +++++ .../fvMesh/wallDist/fvWallPoint/fvWallPoint.H | 140 +++ .../wallDist/fvWallPoint/fvWallPointI.H | 121 ++ .../fvWallPointData/fvWallPointData.C} | 10 +- .../fvWallPointData/fvWallPointData.H} | 103 +- .../fvWallPointData/fvWallPointDataI.H} | 76 +- .../fvWallPointYPlus.C} | 6 +- .../fvWallPointYPlus.H} | 56 +- .../fvWallPointYPlusI.H} | 65 +- .../wallDist/nearWallDist/nearWallDist.C | 38 +- .../wallDist/nearWallDist/nearWallDist.H | 11 +- .../meshWave/meshWavePatchDistMethod.C | 17 +- .../patchDistMethod/patchDistMethod.H | 20 +- .../fvMesh/wallDist/wallDist/wallDist.C | 35 +- .../fvMesh/wallDist/wallDist/wallDist.H | 11 +- .../volPointInterpolation/pointConstraints.C | 8 +- .../volPointInterpolation/pointConstraints.H | 6 +- .../volPointInterpolation.C | 24 +- .../volPointInterpolation.H | 18 +- .../field/layerAverage/layerAverage.C | 2 +- .../field/layerAverage/layerAverage.H | 4 +- .../field/streamlines/streamlines.C | 2 +- .../field/streamlines/streamlines.H | 4 +- .../fixedTemperatureConstraint.C | 24 +- .../fixedTemperatureConstraint.H | 13 +- .../fixedValueConstraint.C | 24 +- .../fixedValueConstraint.H | 13 +- src/fvConstraints/limitMag/limitMag.C | 24 +- src/fvConstraints/limitMag/limitMag.H | 13 +- .../limitPressure/limitPressure.C | 18 +- .../limitPressure/limitPressure.H | 13 +- .../limitTemperature/limitTemperature.C | 24 +- .../limitTemperature/limitTemperature.H | 13 +- .../meanVelocityForce/meanVelocityForce.C | 24 +- .../meanVelocityForce/meanVelocityForce.H | 13 +- .../fvMeshDistributorsDistributor.C | 6 +- .../fvMeshDistributorsDistributor.H | 5 +- .../layered/fvMeshMoversLayeredEngine.C | 8 +- .../layered/fvMeshMoversLayeredEngine.H | 5 +- src/fvMeshMovers/inkJet/fvMeshMoversInkJet.C | 8 +- src/fvMeshMovers/inkJet/fvMeshMoversInkJet.H | 5 +- .../interpolator/fvMeshMoversInterpolator.C | 11 +- .../interpolator/fvMeshMoversInterpolator.H | 5 +- .../motionSolver/fvMeshMoversMotionSolver.C | 10 +- .../motionSolver/fvMeshMoversMotionSolver.H | 5 +- .../linearValveFvMesh/linearValveFvMesh.C | 12 +- .../linearValveFvMesh/linearValveFvMesh.H | 5 +- .../linearValveLayersFvMesh.C | 6 +- .../linearValveLayersFvMesh.H | 5 +- .../mixerFvMesh/mixerFvMesh.H | 5 +- .../movingCone/fvMeshTopoChangersMovingCone.C | 9 +- .../movingCone/fvMeshTopoChangersMovingCone.H | 5 +- .../raw/fvMeshTopoChangersRaw.C | 6 +- .../raw/fvMeshTopoChangersRaw.H | 5 +- .../refiner/fvMeshTopoChangersRefiner.C | 17 +- .../refiner/fvMeshTopoChangersRefiner.H | 5 +- .../accelerationSource/accelerationSource.C | 24 +- .../accelerationSource/accelerationSource.H | 17 +- .../actuationDiskSource/actuationDiskSource.C | 24 +- .../actuationDiskSource/actuationDiskSource.H | 17 +- .../derived/buoyancyEnergy/buoyancyEnergy.C | 18 +- .../derived/buoyancyEnergy/buoyancyEnergy.H | 13 +- .../derived/buoyancyForce/buoyancyForce.C | 18 +- .../derived/buoyancyForce/buoyancyForce.H | 13 +- .../isotropicDamping/isotropicDamping.C | 18 +- .../isotropicDamping/isotropicDamping.H | 13 +- .../damping/verticalDamping/verticalDamping.C | 18 +- .../damping/verticalDamping/verticalDamping.H | 13 +- .../effectivenessHeatExchangerSource.C | 24 +- .../effectivenessHeatExchangerSource.H | 25 +- .../explicitPorositySource.C | 24 +- .../explicitPorositySource.H | 17 +- src/fvModels/derived/heatSource/heatSource.C | 24 +- src/fvModels/derived/heatSource/heatSource.H | 17 +- .../derived/heatTransfer/heatTransfer.C | 24 +- .../derived/heatTransfer/heatTransfer.H | 17 +- src/fvModels/derived/massSource/massSource.C | 24 +- src/fvModels/derived/massSource/massSource.H | 17 +- .../phaseLimitStabilisation.C | 18 +- .../phaseLimitStabilisation.H | 13 +- .../derived/rotorDiskSource/rotorDiskSource.C | 24 +- .../derived/rotorDiskSource/rotorDiskSource.H | 17 +- .../sixDoFAccelerationSource.C | 18 +- .../sixDoFAccelerationSource.H | 13 +- .../solidEquilibriumEnergySource.C | 18 +- .../solidEquilibriumEnergySource.H | 13 +- .../solidificationMeltingSource.C | 24 +- .../solidificationMeltingSource.H | 17 +- .../volumeFractionSource.C | 18 +- .../volumeFractionSource.H | 13 +- .../general/codedFvModel/codedFvModel.C | 22 +- .../general/codedFvModel/codedFvModel.H | 17 +- .../semiImplicitSource/semiImplicitSource.C | 24 +- .../semiImplicitSource/semiImplicitSource.H | 17 +- .../interRegionExplicitPorositySource.C | 21 +- .../interRegionExplicitPorositySource.H | 13 +- .../interRegionHeatTransfer.C | 18 +- .../interRegionHeatTransfer.H | 13 +- ...lacementComponentLaplacianFvMotionSolver.C | 4 +- ...lacementComponentLaplacianFvMotionSolver.H | 2 +- ...velocityComponentLaplacianFvMotionSolver.C | 4 +- ...velocityComponentLaplacianFvMotionSolver.H | 2 +- .../displacementSBRStressFvMotionSolver.C | 4 +- .../displacementSBRStressFvMotionSolver.H | 2 +- .../displacementLaplacianFvMotionSolver.C | 4 +- .../displacementLaplacianFvMotionSolver.H | 2 +- .../velocityLaplacianFvMotionSolver.C | 4 +- .../velocityLaplacianFvMotionSolver.H | 2 +- .../inverseDistanceDiffusivity.C | 44 +- .../inverseDistanceDiffusivity.H | 8 +- .../inverseFaceDistanceDiffusivity.C | 160 ++- .../inverseFaceDistanceDiffusivity.H | 5 +- .../Templates/MomentumCloud/MomentumCloud.C | 6 +- .../Templates/MomentumCloud/MomentumCloud.H | 2 +- .../Templates/ReactingCloud/ReactingCloud.C | 2 +- .../ReactingMultiphaseCloud.C | 2 +- .../Templates/ThermoCloud/ThermoCloud.C | 2 +- .../parcel/fvModels/clouds/clouds.C | 6 +- .../parcel/fvModels/clouds/clouds.H | 7 +- .../CellZoneInjection/CellZoneInjection.C | 6 +- .../CellZoneInjection/CellZoneInjection.H | 4 +- .../ConeInjection/ConeInjection.C | 8 +- .../ConeInjection/ConeInjection.H | 4 +- .../FieldActivatedInjection.C | 6 +- .../FieldActivatedInjection.H | 4 +- .../InflationInjection/InflationInjection.C | 4 +- .../InflationInjection/InflationInjection.H | 4 +- .../InjectionModel/InjectionModel.C | 4 +- .../InjectionModel/InjectionModel.H | 4 +- .../InjectionModel/InjectionModelList.C | 6 +- .../InjectionModel/InjectionModelList.H | 4 +- .../ManualInjection/ManualInjection.C | 6 +- .../ManualInjection/ManualInjection.H | 4 +- .../MomentumLookupTableInjection.C | 6 +- .../MomentumLookupTableInjection.H | 4 +- .../PatchFlowRateInjection.C | 8 +- .../PatchFlowRateInjection.H | 8 +- .../PatchInjection/PatchInjection.C | 8 +- .../PatchInjection/PatchInjection.H | 8 +- .../PatchInjection/patchInjectionBase.C | 6 +- .../PatchInjection/patchInjectionBase.H | 4 +- .../ReactingLookupTableInjection.C | 6 +- .../ReactingLookupTableInjection.H | 4 +- .../ReactingMultiphaseLookupTableInjection.C | 6 +- .../ReactingMultiphaseLookupTableInjection.H | 4 +- .../ThermoLookupTableInjection.C | 6 +- .../ThermoLookupTableInjection.H | 4 +- .../displacementMeshMoverMotionSolver.C | 4 +- .../displacementMeshMoverMotionSolver.H | 2 +- .../externalDisplacementMeshMover.C | 2 +- .../externalDisplacementMeshMover.H | 2 +- .../medialAxisMeshMover.H | 2 +- .../meshRefinement/meshRefinement.C | 18 +- .../meshRefinement/meshRefinement.H | 4 +- .../meshRefinement/meshRefinementBaffles.C | 16 +- .../meshRefinement/meshRefinementMerge.C | 36 +- .../meshRefinement/meshRefinementRefine.C | 4 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 10 +- .../cyclicAMIPointPatch/cyclicAMIPointPatch.C | 10 +- .../cyclicAMIPointPatch/cyclicAMIPointPatch.H | 6 +- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 10 +- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.H | 6 +- .../mappedPolyPatch/mappedPolyPatch.C | 10 +- .../mappedPolyPatch/mappedPolyPatch.H | 6 +- .../mappedPolyPatch/mappedWallPolyPatch.C | 10 +- .../mappedPolyPatch/mappedWallPolyPatch.H | 6 +- .../patchDist/patchDistFuncs/patchDistFuncs.C | 72 +- .../patchDist/patchDistFuncs/patchDistFuncs.H | 18 +- .../patchDistFuncs/patchDistFuncsTemplates.C | 81 +- .../patchDist/patchDistWave/patchDistWave.H | 42 +- .../patchDistWave/patchDistWaveTemplates.C | 142 +-- src/meshTools/patchDist/wallPoint/wallPoint.H | 4 +- .../patchDist/wallPoint/wallPointI.H | 2 +- .../regionCoupledPolyPatch.C | 10 +- .../regionCoupledPolyPatch.H | 6 +- .../regionCoupledWallPolyPatch.C | 10 +- .../regionCoupledWallPolyPatch.H | 6 +- src/meshTools/regionSplit/localPointRegion.C | 2 +- src/meshTools/regionSplit/localPointRegion.H | 2 +- src/meshTools/sets/topoSets/cellSet.C | 2 +- src/meshTools/sets/topoSets/cellSet.H | 2 +- src/meshTools/sets/topoSets/cellZoneSet.C | 2 +- src/meshTools/sets/topoSets/cellZoneSet.H | 2 +- src/meshTools/sets/topoSets/faceSet.C | 2 +- src/meshTools/sets/topoSets/faceSet.H | 2 +- src/meshTools/sets/topoSets/faceZoneSet.C | 2 +- src/meshTools/sets/topoSets/faceZoneSet.H | 2 +- src/meshTools/sets/topoSets/pointSet.C | 2 +- src/meshTools/sets/topoSets/pointSet.H | 4 +- src/meshTools/sets/topoSets/pointZoneSet.C | 2 +- src/meshTools/sets/topoSets/pointZoneSet.H | 2 +- src/meshTools/sets/topoSets/topoSet.C | 2 +- src/meshTools/sets/topoSets/topoSet.H | 2 +- .../twoDPointCorrector/twoDPointCorrector.C | 8 +- .../twoDPointCorrector/twoDPointCorrector.H | 5 +- .../fvModels/radiation/radiation.C | 6 +- .../fvModels/radiation/radiation.H | 7 +- .../fvModels/surfaceFilm/surfaceFilm.C | 6 +- .../fvModels/surfaceFilm/surfaceFilm.H | 7 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 2 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.H | 2 +- .../rigidBodyMeshMotionSolver.C | 10 +- .../rigidBodyMeshMotionSolver.H | 5 +- src/sampling/probes/probes.C | 4 +- src/sampling/probes/probes.H | 8 +- .../sampledSet/sampledSets/sampledSets.C | 2 +- .../sampledSet/sampledSets/sampledSets.H | 6 +- .../sampledSurfaces/sampledSurfaces.C | 2 +- .../sampledSurfaces/sampledSurfaces.H | 7 +- 403 files changed, 4953 insertions(+), 1999 deletions(-) create mode 100644 src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.C create mode 100644 src/OpenFOAM/meshes/polyMesh/polyMeshMap/polyMeshMap.H create mode 100644 src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.C create mode 100644 src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWave.H create mode 100644 src/finiteVolume/algorithms/FvFaceCellWave/FvFaceCellWaveName.C create mode 100644 src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWave.H create mode 100644 src/finiteVolume/fvMesh/wallDist/fvPatchDistWave/fvPatchDistWaveTemplates.C create mode 100644 src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPoint.H create mode 100644 src/finiteVolume/fvMesh/wallDist/fvWallPoint/fvWallPointI.H rename src/{meshTools/patchDist/wallPointData/wallPointData.C => finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.C} (88%) rename src/{meshTools/patchDist/wallPointData/wallPointData.H => finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointData.H} (68%) rename src/{meshTools/patchDist/wallPointData/wallPointDataI.H => finiteVolume/fvMesh/wallDist/fvWallPointData/fvWallPointDataI.H} (69%) rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlus.C => fvWallPointYPlus/fvWallPointYPlus.C} (89%) rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlus.H => fvWallPointYPlus/fvWallPointYPlus.H} (77%) rename src/finiteVolume/fvMesh/wallDist/{wallPointYPlus/wallPointYPlusI.H => fvWallPointYPlus/fvWallPointYPlusI.H} (71%) diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C index af38397fb3..8dd73a6272 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C @@ -162,7 +162,11 @@ void Foam::fv::VoFClouds::preUpdateMesh() } -void Foam::fv::VoFClouds::updateMesh(const polyTopoChangeMap&) +void Foam::fv::VoFClouds::topoChange(const polyTopoChangeMap&) +{} + + +void Foam::fv::VoFClouds::mapMesh(const polyMeshMap& map) {} diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H index 1256d6fb49..ed5c571da1 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H @@ -148,8 +148,11 @@ public: //- Prepare for mesh update virtual void preUpdateMesh(); - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C index 75410a533e..2cb983a7f9 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C @@ -222,12 +222,18 @@ void Foam::fv::VoFSolidificationMeltingSource::correct() } -void Foam::fv::VoFSolidificationMeltingSource::updateMesh +void Foam::fv::VoFSolidificationMeltingSource::topoChange ( const polyTopoChangeMap& map ) { - set_.updateMesh(map); + set_.topoChange(map); +} + + +void Foam::fv::VoFSolidificationMeltingSource::mapMesh(const polyMeshMap& map) +{ + set_.mapMesh(map); } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H index 384bd456d1..3ad77e8564 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H @@ -190,8 +190,11 @@ public: // Mesh motion - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C index 3924f0aa8f..dd63abf084 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C @@ -153,7 +153,13 @@ void Foam::fv::VoFSurfaceFilm::addSup } -void Foam::fv::VoFSurfaceFilm::updateMesh(const polyTopoChangeMap&) +void Foam::fv::VoFSurfaceFilm::topoChange(const polyTopoChangeMap&) +{ + NotImplemented; +} + + +void Foam::fv::VoFSurfaceFilm::mapMesh(const polyMeshMap& map) { NotImplemented; } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H index 3a2d71b54d..6f25b0b197 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H @@ -135,8 +135,11 @@ public: // Mesh changes - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C index 4e04df9008..17b6d87a98 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C @@ -207,7 +207,11 @@ void Foam::fv::VoFTurbulenceDamping::addSup } -void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&) +void Foam::fv::VoFTurbulenceDamping::topoChange(const polyTopoChangeMap&) +{} + + +void Foam::fv::VoFTurbulenceDamping::mapMesh(const polyMeshMap& map) {} diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 92a125d479..c2faeabcc6 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -174,8 +174,11 @@ public: // Mesh changes - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C index 7fb3bec588..1150e4149d 100644 --- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C @@ -202,7 +202,11 @@ void Foam::fv::VoFTurbulenceDamping::addSup } -void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&) +void Foam::fv::VoFTurbulenceDamping::topoChange(const polyTopoChangeMap&) +{} + + +void Foam::fv::VoFTurbulenceDamping::mapMesh(const polyMeshMap& map) {} diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 0d10cef578..f80178999a 100644 --- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -173,8 +173,11 @@ public: // Mesh changes - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C index 5f389e06b4..366d4307bb 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C @@ -304,7 +304,11 @@ void Foam::fv::interfaceTurbulenceDamping::addSup } -void Foam::fv::interfaceTurbulenceDamping::updateMesh(const polyTopoChangeMap&) +void Foam::fv::interfaceTurbulenceDamping::topoChange(const polyTopoChangeMap&) +{} + + +void Foam::fv::interfaceTurbulenceDamping::mapMesh(const polyMeshMap& map) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H index 9e8906baee..674bdb13c4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H @@ -194,8 +194,11 @@ public: // Mesh changes - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C index 001d6b08c1..aedf57a0fc 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C @@ -235,13 +235,17 @@ void Foam::fv::phaseTurbulenceStabilisation::addSup } -void Foam::fv::phaseTurbulenceStabilisation::updateMesh +void Foam::fv::phaseTurbulenceStabilisation::topoChange ( const polyTopoChangeMap& ) {} +void Foam::fv::phaseTurbulenceStabilisation::mapMesh(const polyMeshMap& map) +{} + + void Foam::fv::phaseTurbulenceStabilisation::distribute ( const polyDistributionMap& diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H index 74938b74cf..be0e699cad 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H @@ -164,8 +164,11 @@ public: // Mesh changes - //- Update for mesh changes - virtual void updateMesh(const polyTopoChangeMap&); + //- Update topology using the given map + virtual void topoChange(const polyTopoChangeMap&); + + //- Update from another mesh using the given map + virtual void mapMesh(const polyMeshMap&); //- Redistribute or update using the given distribution map virtual void distribute(const polyDistributionMap&); diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index a7fcf709a5..fedbf67e17 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -200,7 +200,7 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, inflate); Info<< "Mapping fields" << nl << endl; - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) @@ -210,7 +210,7 @@ int main(int argc, char *argv[]) } // Update numbering of cells/vertices. - faceRemover.updateMesh(map); + faceRemover.topoChange(map); Info<< "Writing fields" << nl << endl; diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 1d570f533e..3b1a03d73d 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -277,7 +277,7 @@ int main(int argc, char *argv[]) // Update fields Info<< nl << "-- mapping mesh data" << endl; - mesh.updateMesh(map); + mesh.topoChange(map); // Inflate mesh if (map().hasMotionPoints()) @@ -288,7 +288,7 @@ int main(int argc, char *argv[]) // Update numbering of cells/vertices. Info<< nl << "-- mapping hexRef8 data" << endl; - meshCutter.updateMesh(map); + meshCutter.topoChange(map); } diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index 4cf0cac8f4..ef6b064ac3 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -1075,7 +1075,7 @@ int main(int argc, char *argv[]) meshMod.changeMesh(subsetter.subMesh(), false); // Update fields - subsetter.subMesh().updateMesh(map); + subsetter.subMesh().topoChange(map); // Fix faces that get mapped to zero-sized patches (these don't get any // value) diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 4e8d11efef..2a5501b814 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -521,7 +521,7 @@ void subsetMesh } // Update topology on cellRemover - cellRemover.updateMesh(map()); + cellRemover.topoChange(map()); // Update refLevel for removed cells. const labelList& cellMap = map().cellMap(); @@ -547,7 +547,7 @@ void subsetMesh } // Update cutCells for removed cells. - cutCells.updateMesh(map()); + cutCells.topoChange(map()); } diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index 14857e23a8..4d699aa3c6 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -108,7 +108,7 @@ label mergePatchFaces map = meshMod.changeMesh(mesh, false, true); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) @@ -264,7 +264,7 @@ label mergePatchFaces map = meshMod.changeMesh(mesh, false, true); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) @@ -317,7 +317,7 @@ label mergeEdges(const scalar minCos, polyMesh& mesh) autoPtr map = meshMod.changeMesh(mesh, false, true); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C index f70d27f45a..fefbac70ef 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C +++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C @@ -461,7 +461,7 @@ void Foam::cellSplitter::setRefinement } -void Foam::cellSplitter::updateMesh(const polyTopoChangeMap& map) +void Foam::cellSplitter::topoChange(const polyTopoChangeMap& map) { // Create copy since we're deleting entries. Only if both cell and added // point get mapped do they get inserted. diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H index 0133517d3d..0c141af14a 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H +++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H @@ -123,7 +123,7 @@ public: ); //- Force recalculation of locally stored data on topological change - void updateMesh(const polyTopoChangeMap&); + void topoChange(const polyTopoChangeMap&); // Access diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index 2d6ba45b5b..96b90ae6be 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -537,7 +537,7 @@ int main(int argc, char *argv[]) mesh.movePoints(map().preMotionPoints()); } - cutter.updateMesh(map()); + cutter.topoChange(map()); if (!overwrite) { @@ -610,7 +610,7 @@ int main(int argc, char *argv[]) } // Not implemented yet: - // cutter.updateMesh(map()); + // cutter.topoChange(map()); if (!overwrite) @@ -654,7 +654,7 @@ int main(int argc, char *argv[]) mesh.movePoints(map().preMotionPoints()); } - cutter.updateMesh(map()); + cutter.topoChange(map()); if (!overwrite) { diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index 4748bb82ca..458fa3f428 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C @@ -145,10 +145,10 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, false); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Update numbering of cells/vertices. - meshCutter.updateMesh(map); + meshCutter.topoChange(map); // Optionally inflate mesh if (map().hasMotionPoints()) diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index 14f9cb35be..d791339ca2 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -248,7 +248,7 @@ int main(int argc, char *argv[]) } // Update stored labels on meshCutter. - cutter.updateMesh(map()); + cutter.topoChange(map()); Info<< "Finished refining" << endl; diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C index 4e05e714ca..1d04f6fed5 100644 --- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C +++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, false); - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) } // Update numbering of cells/vertices. - faceRemover.updateMesh(map); + faceRemover.topoChange(map); if (!overwrite) { diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C index f49b285b45..743f20e10a 100644 --- a/applications/utilities/mesh/advanced/splitCells/splitCells.C +++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C @@ -693,10 +693,10 @@ int main(int argc, char *argv[]) } // Update stored labels on meshCutter - cutter.updateMesh(map()); + cutter.topoChange(map()); // Update cellSet - cellsToCut.updateMesh(map()); + cellsToCut.topoChange(map()); Info<< "Remaining:" << cellsToCut.size() << endl; diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C index 83abc00ae2..143b62ebcf 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C @@ -424,7 +424,7 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, false); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Move mesh (since morphing does not do this) if (map().hasMotionPoints()) @@ -708,7 +708,7 @@ int main(int argc, char *argv[]) mesh ); - layerExtrude.updateMesh + layerExtrude.topoChange ( map(), identity(extrudePatch.size()), @@ -884,7 +884,7 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, false); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Update stored data updateFaceLabels(map(), frontPatchFaces); @@ -1016,7 +1016,7 @@ int main(int argc, char *argv[]) autoPtr map = meshMod.changeMesh(mesh, false); // Update fields - mesh.updateMesh(map); + mesh.topoChange(map); // Update local data updateCellSet(map(), addedCellsSet); diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C index d0b046992c..055b9871e1 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C @@ -2312,7 +2312,7 @@ int main(int argc, char *argv[]) // Update numbering on extruder. - extruder.updateMesh(shellMap); + extruder.topoChange(shellMap); // Calculate offsets from shell mesh back to original mesh @@ -2659,7 +2659,7 @@ int main(int argc, char *argv[]) addBafflesMap = meshMod.changeMesh(mesh, false); // Update fields - mesh.updateMesh(addBafflesMap); + mesh.topoChange(addBafflesMap); //XXXXXX diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C index c6ec0c19fb..4e21580c87 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) // Create a mesh from topo changes. autoPtr map = meshMod().changeMesh(mesh(), false); - mesh().updateMesh(map); + mesh().topoChange(map); { edgeCollapser collapser(mesh()); @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) autoPtr map = meshModCollapse.changeMesh(mesh(), false); - mesh().updateMesh(map); + mesh().topoChange(map); } if (!overwrite) diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H index c5049bbcaa..44542e4adb 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H @@ -119,7 +119,7 @@ public: void setRefinement(polyTopoChange&); //- Force recalculation of locally stored data on topological change - void updateMesh(const polyTopoChangeMap&) + void topoChange(const polyTopoChangeMap&) {} //- Force recalculation of locally stored data for mesh distribution diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index b253d60933..570a6d562e 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -246,10 +246,10 @@ void Foam::backgroundMeshDecomposition::initialRefinement() ); // Update fields - mesh_.updateMesh(map); + mesh_.topoChange(map); // Update numbering of cells/vertices. - meshCutter_.updateMesh(map); + meshCutter_.topoChange(map); { // Map volumeStatus @@ -355,11 +355,11 @@ void Foam::backgroundMeshDecomposition::initialRefinement() ); // Update fields - mesh_.updateMesh(map); + mesh_.topoChange(map); // Update numbering of cells/vertices. - meshCutter_.updateMesh(map); - cellRemover.updateMesh(map); + meshCutter_.topoChange(map); + cellRemover.topoChange(map); { // Map volumeStatus @@ -947,10 +947,10 @@ Foam::backgroundMeshDecomposition::distribute ); // Update fields - mesh_.updateMesh(map); + mesh_.topoChange(map); // Update numbering of cells/vertices. - meshCutter_.updateMesh(map); + meshCutter_.topoChange(map); Info<< " Background mesh refined from " << returnReduce(map().nOldCells(), sumOp