From 56fa7c09063f531089f9c340ea7daa2e62ffd209 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 10 Jan 2016 22:41:16 +0000 Subject: [PATCH] Update code to use the simpler C++11 template syntax removing spaces between closing ">"s --- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 4 +- .../solvers/combustion/PDRFoam/bEqn.H | 2 +- .../solvers/combustion/XiFoam/ftEqn.H | 2 +- .../chemFoam/createSingleCellMesh.H | 2 +- .../solvers/combustion/fireFoam/YEEqn.H | 2 +- .../solvers/combustion/reactingFoam/YEqn.H | 2 +- .../mixedFixedValueSlipFvPatchField.C | 8 +- .../mixedFixedValueSlipFvPatchField.H | 14 +- .../rhoCentralFoam/directionInterpolate.H | 4 +- .../solvers/lagrangian/DPMFoam/createFields.H | 2 +- .../lagrangian/coalChemistryFoam/YEqn.H | 2 +- .../lagrangian/reactingParcelFilmFoam/YEqn.H | 2 +- .../lagrangian/reactingParcelFoam/YEqn.H | 2 +- .../simpleReactingParcelFoam/YEqn.H | 2 +- .../solvers/multiphase/interFoam/alphaEqn.H | 10 +- .../interPhaseChangeFoam/alphaEqn.H | 2 +- .../interPhaseChangeDyMFoam/pEqn.H | 2 +- .../multiphase/interPhaseChangeFoam/pEqn.H | 2 +- .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.C | 10 +- .../phaseChangeTwoPhaseMixtures/Kunz/Kunz.H | 6 +- .../Merkle/Merkle.C | 10 +- .../Merkle/Merkle.H | 6 +- .../SchnerrSauer/SchnerrSauer.C | 10 +- .../SchnerrSauer/SchnerrSauer.H | 6 +- .../phaseChangeTwoPhaseMixture.C | 14 +- .../phaseChangeTwoPhaseMixture.H | 10 +- .../InterfaceCompositionModel.H | 10 +- .../Raoult/Raoult.C | 4 +- .../Raoult/Raoult.H | 4 +- .../BlendedInterfacialModel.C | 6 +- .../BlendedInterfacialModel.H | 4 +- .../HeatAndMassTransferPhaseSystem.H | 6 +- .../HeatTransferPhaseSystem.H | 4 +- .../MomentumTransferPhaseSystem.C | 10 +- .../MomentumTransferPhaseSystem.H | 16 +- .../phaseCompressibleTurbulenceModel.H | 4 +- .../phaseCompressibleTurbulenceModelFwd.H | 4 +- .../phaseSystems/phaseSystem/phaseSystem.H | 6 +- .../phaseSystem/phaseSystemTemplates.C | 10 +- .../multiphaseSystem/multiphaseSystem.H | 6 +- .../reactingMultiphaseEulerFoam/pU/pEqn.H | 4 +- .../kineticTheoryModel/kineticTheoryModel.C | 6 +- .../kineticTheoryModel/kineticTheoryModel.H | 4 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../phasePressureModel/phasePressureModel.H | 4 +- .../kineticTheoryModel/kineticTheoryModel.C | 6 +- .../kineticTheoryModel/kineticTheoryModel.H | 4 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../phasePressureModel/phasePressureModel.H | 4 +- .../BlendedInterfacialModel.C | 6 +- .../BlendedInterfacialModel.H | 4 +- .../twoPhaseSystem/phaseModel/phaseModel.H | 4 +- .../twoPhaseSystem/twoPhaseSystem.H | 14 +- .../CompactListList/Test-CompactListList.C | 6 +- .../test/DynamicList/Test-DynamicList.C | 6 +- .../test/HashTable2/Test-HashTable2.C | 4 +- .../test/HashTable3/Test-HashTable3.C | 8 +- .../test/PackedList2/Test-PackedList2.C | 6 +- .../test/PatchTools/Test-PatchTools.C | 4 +- applications/test/dataEntry/Test-DataEntry.C | 4 +- .../extendedStencil/Test-ExtendedStencil.C | 28 +- .../extendedStencil/Test-ExtendedStencil2.C | 6 +- applications/test/parallel/Test-parallel.C | 4 +- applications/test/regex/Test-regex.C | 4 +- .../test/thermoMixture/Test-thermoMixture.C | 4 +- applications/test/wordRe/Test-wordRe.C | 4 +- applications/test/xfer/Test-xferList.C | 6 +- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 10 +- .../mesh/advanced/modifyMesh/modifyMesh.C | 16 +- .../refinementLevel/refinementLevel.C | 4 +- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 6 +- .../mesh/conversion/ansysToFoam/ansysToFoam.L | 6 +- .../fluentMeshToFoam/fluentMeshToFoam.L | 4 +- .../mesh/conversion/gmshToFoam/gmshToFoam.C | 14 +- .../ideasUnvToFoam/ideasUnvToFoam.C | 6 +- .../mesh/conversion/kivaToFoam/readKivaGrid.H | 2 +- .../netgenNeutralToFoam/netgenNeutralToFoam.C | 8 +- .../star3ToFoam/createCoupleMatches.C | 22 +- .../conversion/tetgenToFoam/tetgenToFoam.C | 4 +- .../mesh/generation/blockMesh/blockMeshApp.C | 6 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 4 +- .../extrude2DMesh/extrude2DMeshApp.C | 4 +- .../cellSizeAndAlignmentGrid.C | 8 +- .../DelaunayMesh/DelaunayMesh.H | 6 +- .../DelaunayMesh/DelaunayMeshIO.C | 10 +- .../DelaunayMesh/DistributedDelaunayMesh.H | 4 +- .../backgroundMeshDecomposition.C | 6 +- .../backgroundMeshDecomposition.H | 6 +- .../smoothAlignmentSolver.C | 10 +- .../smoothAlignmentSolver.H | 4 +- .../conformalVoronoiMesh.H | 22 +- .../conformalVoronoiMeshCalcDualMesh.C | 36 +- .../conformalVoronoiMeshConformToSurface.C | 6 +- .../featurePointConformer.C | 8 +- .../featurePointConformer.H | 4 +- .../indexedCell/indexedCell.C | 4 +- .../indexedCell/indexedCell.H | 8 +- .../indexedVertex/indexedVertex.C | 4 +- .../indexedVertex/indexedVertex.H | 10 +- .../conformalVoronoiMesh/pointConversion.H | 4 +- .../conformationSurfaces.C | 16 +- .../conformationSurfaces.H | 4 +- .../foamyMesh/foamyHexMesh/foamyHexMesh.C | 4 +- .../foamyHexMeshSurfaceSimplify.C | 4 +- .../foamyMesh/foamyQuadMesh/indexedFace.H | 4 +- .../foamyMesh/foamyQuadMesh/indexedVertex.H | 4 +- .../foamyQuadMesh/shortEdgeFilter2D.C | 8 +- .../foamyQuadMesh/shortEdgeFilter2D.H | 6 +- .../generation/snappyHexMesh/snappyHexMesh.C | 20 +- .../splitMeshRegions/splitMeshRegions.C | 26 +- .../mesh/manipulation/subsetMesh/subsetMesh.C | 8 +- .../helpBoundary/helpBoundaryTemplates.C | 4 +- .../miscellaneous/patchSummary/patchSummary.C | 6 +- .../decomposePar/decomposePar.C | 38 +- .../decomposePar/dimFieldDecomposer.H | 4 +- .../dimFieldDecomposerDecomposeFields.C | 6 +- .../decomposePar/domainDecomposition.C | 10 +- .../decomposePar/domainDecomposition.H | 12 +- .../decomposePar/domainDecompositionMesh.C | 12 +- .../domainDecompositionTemplates.C | 6 +- .../decomposePar/lagrangianFieldDecomposer.C | 4 +- .../decomposePar/lagrangianFieldDecomposer.H | 14 +- ...lagrangianFieldDecomposerDecomposeFields.C | 22 +- .../decomposePar/pointFieldDecomposer.H | 4 +- .../pointFieldDecomposerDecomposeFields.C | 8 +- .../foamToEnsight/ensightField.C | 8 +- .../foamToEnsight/ensightField.H | 4 +- .../foamToEnsight/foamToEnsight.C | 8 +- .../foamToEnsightParts/ensightOutputCase.H | 6 +- .../foamToEnsightParts/findFields.H | 2 +- .../foamToEnsightParts/foamToEnsightParts.C | 8 +- .../foamToTecplot360/tecplotWriter.H | 6 +- .../foamToTecplot360/tecplotWriterTemplates.C | 8 +- .../dataConversion/foamToVTK/internalWriter.H | 6 +- .../foamToVTK/internalWriterTemplates.C | 6 +- .../dataConversion/foamToVTK/patchWriter.H | 8 +- .../foamToVTK/patchWriterTemplates.C | 8 +- .../foamToVTK/surfaceMeshWriter.H | 6 +- .../foamToVTK/surfaceMeshWriterTemplates.C | 8 +- .../dataConversion/foamToVTK/writeFuns.H | 6 +- .../foamToVTK/writeFunsTemplates.C | 6 +- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 4 +- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H | 6 +- .../vtkPV3Foam/vtkPV3FoamFields.C | 4 +- .../vtkPV3Foam/vtkPV3FoamMeshVolume.C | 4 +- .../vtkPV3Foam/vtkPV3FoamUpdateInfo.C | 14 +- .../vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H | 12 +- .../vtkPV3Foam/vtkPV3FoamVolFields.H | 12 +- .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.C | 4 +- .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H | 6 +- .../vtkPV4Foam/vtkPV4FoamFields.C | 4 +- .../vtkPV4Foam/vtkPV4FoamMeshVolume.C | 4 +- .../vtkPV4Foam/vtkPV4FoamUpdateInfo.C | 14 +- .../vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H | 12 +- .../vtkPV4Foam/vtkPV4FoamVolFields.H | 12 +- .../particleTracks/particleTracks.C | 8 +- .../steadyParticleTracks.C | 8 +- .../steadyParticleTracksTemplates.C | 16 +- .../steadyParticleTracksTemplates.H | 12 +- .../dsmcFieldsCalc/dsmcFieldsCalc.C | 4 +- ...ateExternalCoupledPatchGeometryTemplates.C | 6 +- .../mapFields/MapLagrangianFields.H | 6 +- .../mapFieldsPar/MapLagrangianFields.H | 6 +- .../viewFactorsGen/viewFactorsGen.C | 6 +- .../tabulatedWallFunction/general/general.C | 4 +- .../surfaceBooleanFeatures.C | 6 +- .../surfaceFeatureExtract.C | 4 +- .../surface/surfaceHookUp/surfaceHookUp.C | 10 +- .../surfaceRedistributePar.C | 6 +- .../adiabaticFlameT/adiabaticFlameT.C | 4 +- .../equilibriumCO/equilibriumCO.C | 4 +- .../equilibriumFlameT/equilibriumFlameT.C | 4 +- .../mixtureAdiabaticFlameT.C | 4 +- bin/foamNewBC | 4 +- doc/codingStyleGuide.org | 2 +- etc/codeTemplates/BC/BC.H | 4 +- .../fixedValuePointPatchFieldTemplate.H | 8 +- .../template/_TemplateTemplate.C | 6 +- .../template/_TemplateTemplate.H | 4 +- .../dynamicIndexedOctree.C | 16 +- .../dynamicIndexedOctree.H | 10 +- .../algorithms/indexedOctree/indexedOctree.C | 4 +- .../algorithms/indexedOctree/indexedOctree.H | 6 +- .../containers/HashTables/HashSet/HashSet.H | 8 +- .../HashTables/HashTable/HashTable.C | 4 +- .../HashTables/HashTable/HashTable.H | 6 +- .../HashTables/HashTable/HashTableI.H | 4 +- src/OpenFOAM/containers/HashTables/Map/Map.H | 22 +- .../containers/HashTables/PtrMap/PtrMap.H | 10 +- .../StaticHashTable/StaticHashTable.C | 4 +- .../StaticHashTable/StaticHashTable.H | 10 +- .../StaticHashTable/StaticHashTableI.H | 4 +- .../containers/Identifiers/Keyed/Keyed.H | 6 +- .../containers/Identifiers/Keyed/KeyedI.H | 10 +- .../Lists/BiIndirectList/BiIndirectList.H | 6 +- .../Lists/BiIndirectList/BiIndirectListI.H | 6 +- .../Lists/CompactListList/CompactListList.C | 4 +- .../Lists/CompactListList/CompactListList.H | 12 +- .../Lists/CompactListList/CompactListListI.H | 10 +- .../Lists/Distribution/Distribution.H | 8 +- .../Lists/DynamicList/DynamicList.H | 6 +- .../Lists/DynamicList/DynamicListI.H | 4 +- .../containers/Lists/FixedList/FixedList.H | 4 +- .../containers/Lists/FixedList/FixedListI.H | 6 +- .../containers/Lists/FixedList/FixedListIO.C | 4 +- .../Lists/IndirectList/IndirectList.H | 6 +- .../Lists/IndirectList/IndirectListI.H | 8 +- src/OpenFOAM/containers/Lists/List/List.C | 4 +- src/OpenFOAM/containers/Lists/List/List.H | 8 +- src/OpenFOAM/containers/Lists/List/ListI.H | 10 +- src/OpenFOAM/containers/Lists/List/ListIO.C | 4 +- .../Lists/PackedList/PackedBoolList.H | 4 +- .../Lists/PackedList/PackedBoolListI.H | 4 +- .../containers/Lists/PackedList/PackedList.H | 4 +- .../containers/Lists/PackedList/PackedListI.H | 10 +- .../containers/Lists/PtrList/PtrList.C | 4 +- .../containers/Lists/PtrList/PtrList.H | 6 +- .../containers/Lists/PtrList/PtrListI.H | 4 +- .../Lists/SortableList/SortableList.C | 8 +- .../Lists/SortableList/SortableList.H | 6 +- .../containers/Lists/SubList/SubListI.H | 2 +- src/OpenFOAM/containers/Lists/UList/UListI.H | 4 +- src/OpenFOAM/containers/Lists/UList/UListIO.C | 4 +- .../containers/Lists/UPtrList/UPtrList.C | 4 +- .../containers/Lists/UPtrList/UPtrList.H | 6 +- .../containers/Lists/UPtrList/UPtrListI.H | 4 +- .../IOobjects/CompactIOField/CompactIOField.C | 4 +- .../IOobjects/CompactIOField/CompactIOField.H | 4 +- .../IOobjects/CompactIOList/CompactIOList.C | 4 +- .../IOobjects/CompactIOList/CompactIOList.H | 4 +- src/OpenFOAM/db/IOobjects/IOField/IOField.C | 4 +- src/OpenFOAM/db/IOobjects/IOField/IOField.H | 4 +- src/OpenFOAM/db/IOobjects/IOList/IOList.C | 4 +- src/OpenFOAM/db/IOobjects/IOList/IOList.H | 4 +- src/OpenFOAM/db/IOobjects/IOMap/IOMap.C | 4 +- src/OpenFOAM/db/IOobjects/IOMap/IOMap.H | 4 +- .../db/IOobjects/IOPtrList/IOPtrList.C | 4 +- .../db/IOobjects/IOPtrList/IOPtrList.H | 4 +- .../db/IOstreams/Pstreams/PstreamBuffers.H | 6 +- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C | 14 +- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 10 +- src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H | 4 +- src/OpenFOAM/db/IOstreams/token/token.H | 4 +- src/OpenFOAM/db/dictionary/dictionary.C | 16 +- src/OpenFOAM/db/dictionary/dictionary.H | 8 +- .../primitiveEntry/primitiveEntry.C | 4 +- .../primitiveEntry/primitiveEntry.H | 4 +- .../addToMemberFunctionSelectionTable.H | 14 +- .../DimensionedField/DimensionedField.C | 26 +- .../DimensionedField/DimensionedField.H | 34 +- .../DimensionedFieldFunctions.C | 106 ++-- .../DimensionedFieldFunctions.H | 70 +-- .../DimensionedFieldFunctionsM.C | 134 +++--- .../DimensionedFieldFunctionsM.H | 94 ++-- .../DimensionedField/DimensionedFieldI.H | 4 +- .../DimensionedField/DimensionedFieldIO.C | 4 +- .../DimensionedFieldReuseFunctions.H | 66 +-- .../DimensionedField/SubDimensionedField.H | 6 +- .../DimensionedField/SubDimensionedFieldI.H | 6 +- .../DimensionedScalarField.C | 134 +++--- .../DimensionedScalarField.H | 14 +- .../FieldFields/FieldField/FieldField.C | 46 +- .../FieldFields/FieldField/FieldField.H | 30 +- .../FieldField/FieldFieldFunctions.C | 130 ++--- .../FieldField/FieldFieldFunctions.H | 80 +-- .../FieldField/FieldFieldFunctionsM.C | 110 ++--- .../FieldField/FieldFieldFunctionsM.H | 70 +-- .../FieldField/FieldFieldReuseFunctions.H | 66 +-- .../scalarFieldField/scalarFieldField.C | 22 +- .../scalarFieldField/scalarFieldField.H | 10 +- .../transformFieldField/transformFieldField.C | 36 +- .../transformFieldField/transformFieldField.H | 24 +- .../fields/Fields/DynamicField/DynamicField.C | 6 +- .../fields/Fields/DynamicField/DynamicField.H | 10 +- .../Fields/DynamicField/DynamicFieldI.H | 6 +- src/OpenFOAM/fields/Fields/Field/Field.C | 46 +- src/OpenFOAM/fields/Fields/Field/Field.H | 56 +-- .../fields/Fields/Field/FieldFunctions.C | 114 ++--- .../fields/Fields/Field/FieldFunctions.H | 70 +-- .../fields/Fields/Field/FieldFunctionsM.C | 106 ++-- .../fields/Fields/Field/FieldFunctionsM.H | 66 +-- .../fields/Fields/Field/FieldMapper.H | 6 +- .../fields/Fields/Field/FieldReuseFunctions.H | 62 +-- src/OpenFOAM/fields/Fields/Field/SubField.H | 6 +- src/OpenFOAM/fields/Fields/Field/SubFieldI.H | 6 +- .../sphericalTensorField.C | 14 +- .../Fields/symmTensorField/symmTensorField.C | 12 +- .../symmTransformField/symmTransformField.C | 32 +- .../symmTransformField/symmTransformField.H | 28 +- .../fields/Fields/tensorField/tensorField.C | 8 +- .../Fields/transformField/transformField.H | 26 +- .../transformField/transformFieldTemplates.C | 38 +- .../GeometricField/GeometricBoundaryField.C | 10 +- .../GeometricField/GeometricField.C | 24 +- .../GeometricField/GeometricField.H | 34 +- .../GeometricField/GeometricFieldFunctions.C | 96 ++-- .../GeometricField/GeometricFieldFunctions.H | 40 +- .../GeometricField/GeometricFieldFunctionsM.C | 134 +++--- .../GeometricField/GeometricFieldFunctionsM.H | 94 ++-- .../GeometricField/GeometricFieldI.H | 4 +- .../GeometricFieldReuseFunctions.H | 66 +-- .../GeometricField/MapGeometricFields.H | 4 +- .../GeometricField/uniformInterpolate.C | 4 +- .../GeometricField/uniformInterpolate.H | 4 +- .../GeometricScalarField.C | 134 +++--- .../GeometricScalarField.H | 14 +- .../SlicedGeometricField.C | 10 +- .../SlicedGeometricField.H | 8 +- .../transformGeometricField.C | 36 +- .../transformGeometricField.H | 24 +- .../basicSymmetryPointPatchField.C | 4 +- .../basicSymmetryPointPatchField.H | 10 +- .../calculated/calculatedPointPatchField.C | 8 +- .../calculated/calculatedPointPatchField.H | 10 +- .../basic/coupled/coupledPointPatchField.H | 6 +- .../fixedValue/fixedValuePointPatchField.H | 10 +- .../basic/value/valuePointPatchField.C | 4 +- .../basic/value/valuePointPatchField.H | 12 +- .../zeroGradientPointPatchField.H | 10 +- .../constraint/cyclic/cyclicPointPatchField.C | 6 +- .../constraint/cyclic/cyclicPointPatchField.H | 10 +- .../cyclicSlip/cyclicSlipPointPatchField.C | 4 +- .../cyclicSlip/cyclicSlipPointPatchField.H | 10 +- .../constraint/empty/emptyPointPatchField.H | 10 +- ...nonuniformTransformCyclicPointPatchField.C | 4 +- ...nonuniformTransformCyclicPointPatchField.H | 10 +- .../processor/processorPointPatchField.H | 10 +- .../processorCyclicPointPatchField.H | 10 +- .../symmetry/symmetryPointPatchField.H | 10 +- .../symmetryPlanePointPatchField.C | 4 +- .../symmetryPlanePointPatchField.H | 10 +- .../constraint/wedge/wedgePointPatchField.C | 4 +- .../constraint/wedge/wedgePointPatchField.H | 10 +- .../codedFixedValuePointPatchField.H | 12 +- .../fixedNormalSlipPointPatchField.C | 4 +- .../fixedNormalSlipPointPatchField.H | 10 +- .../derived/slip/slipPointPatchField.H | 10 +- ...eVaryingUniformFixedValuePointPatchField.H | 10 +- .../uniformFixedValuePointPatchField.H | 12 +- .../pointPatchField/pointPatchField.C | 10 +- .../pointPatchField/pointPatchField.H | 22 +- .../pointPatchField/pointPatchFieldNew.C | 14 +- .../interpolation2DTable.C | 16 +- .../interpolation2DTable.H | 14 +- .../interpolationTable/interpolationTable.C | 74 +-- .../interpolationTable/interpolationTable.H | 8 +- .../tableReaders/csv/csvTableReader.C | 8 +- .../tableReaders/csv/csvTableReader.H | 10 +- .../openFoam/openFoamTableReader.C | 6 +- .../openFoam/openFoamTableReader.H | 10 +- .../tableReaders/tableReader.C | 6 +- .../tableReaders/tableReader.H | 8 +- .../PatchToPatchInterpolate.C | 22 +- .../PatchToPatchInterpolation.H | 10 +- .../PrimitivePatchInterpolation.C | 32 +- .../PrimitivePatchInterpolation.H | 20 +- .../LduInterfaceFieldPtrsList.H | 6 +- .../matrices/LduMatrix/LduMatrix/LduMatrix.H | 16 +- .../LduMatrix/LduMatrix/LduMatrixATmul.C | 10 +- .../LduMatrix/LduMatrix/LduMatrixOperations.C | 22 +- src/OpenFOAM/matrices/Matrix/Matrix.H | 4 +- src/OpenFOAM/matrices/Matrix/MatrixI.H | 8 +- .../RectangularMatrix/RectangularMatrix.H | 4 +- .../RectangularMatrix/RectangularMatrixI.H | 6 +- .../matrices/SquareMatrix/SquareMatrix.H | 4 +- .../matrices/SquareMatrix/SquareMatrixI.H | 6 +- .../SymmetricSquareMatrix.H | 4 +- .../SymmetricSquareMatrixI.H | 6 +- .../lduInterface/processorLduInterface.H | 6 +- .../processorLduInterfaceTemplates.C | 10 +- .../matrices/lduMatrix/lduMatrix/lduMatrix.H | 10 +- .../lduMatrix/lduMatrix/lduMatrixTemplates.C | 24 +- .../manualGAMGProcAgglomeration.H | 4 +- .../procFacesGAMGProcAgglomeration.C | 4 +- .../lduMatrix/solvers/GAMG/GAMGSolver.H | 14 +- .../GAMG/GAMGSolverAgglomerateMatrix.C | 20 +- .../interfaces/GAMGInterface/GAMGInterface.H | 4 +- .../GAMGInterface/GAMGInterfaceTemplates.C | 6 +- .../cyclicGAMGInterface/cyclicGAMGInterface.C | 6 +- .../processorGAMGInterface.C | 8 +- src/OpenFOAM/memory/Xfer/XferI.H | 4 +- src/OpenFOAM/meshes/MeshObject/MeshObject.C | 16 +- .../meshes/ProcessorTopology/commSchedule.C | 4 +- src/OpenFOAM/meshes/data/dataTemplates.C | 4 +- src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H | 10 +- .../polyMesh/globalMeshData/globalMeshData.C | 8 +- .../polyMesh/globalMeshData/globalMeshData.H | 4 +- .../polyMesh/globalMeshData/globalPoints.C | 4 +- .../mapPolyMesh/mapDistribute/mapDistribute.C | 22 +- .../mapPolyMesh/mapDistribute/mapDistribute.H | 26 +- .../mapDistribute/mapDistributeTemplates.C | 10 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 4 +- .../polyBoundaryMesh/polyBoundaryMesh.H | 6 +- src/OpenFOAM/meshes/polyMesh/polyMesh.H | 4 +- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 4 +- .../polyMesh/syncTools/dummyTransform.H | 8 +- .../PatchTools/PatchToolsGatherAndMerge.C | 16 +- .../PatchTools/PatchToolsNormals.C | 4 +- .../PrimitivePatch/PrimitivePatch.C | 6 +- .../PrimitivePatch/PrimitivePatch.H | 6 +- .../PrimitivePatch/PrimitivePatchAddressing.C | 8 +- .../PrimitivePatchPointAddressing.C | 4 +- .../meshes/primitiveMesh/primitiveMesh.H | 4 +- .../primitiveMesh/primitiveMeshCellEdges.C | 4 +- .../meshes/primitiveMesh/primitiveMeshEdges.C | 6 +- .../SphericalTensor/SphericalTensorI.H | 10 +- .../SphericalTensor2D/SphericalTensor2DI.H | 10 +- .../primitives/SymmTensor/SymmTensorI.H | 18 +- .../primitives/SymmTensor2D/SymmTensor2DI.H | 18 +- src/OpenFOAM/primitives/Tensor/Tensor.H | 6 +- src/OpenFOAM/primitives/Tensor/TensorI.H | 32 +- src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H | 26 +- src/OpenFOAM/primitives/Vector/Vector.H | 4 +- src/OpenFOAM/primitives/Vector/VectorI.H | 6 +- src/OpenFOAM/primitives/Vector2D/Vector2DI.H | 4 +- .../primitives/bools/lists/boolList.H | 4 +- .../primitives/contiguous/contiguous.H | 54 +-- .../primitives/functions/DataEntry/CSV/CSV.C | 4 +- .../primitives/functions/DataEntry/CSV/CSV.H | 6 +- .../CompatibilityConstant.H | 6 +- .../functions/DataEntry/Constant/Constant.H | 6 +- .../functions/DataEntry/DataEntry/DataEntry.C | 26 +- .../functions/DataEntry/DataEntry/DataEntry.H | 18 +- .../DataEntry/DataEntry/DataEntryNew.C | 6 +- .../PolynomialEntry/PolynomialEntry.C | 4 +- .../PolynomialEntry/PolynomialEntry.H | 10 +- .../functions/DataEntry/Table/Table.H | 6 +- .../functions/DataEntry/Table/TableBase.C | 6 +- .../functions/DataEntry/Table/TableBase.H | 6 +- .../functions/DataEntry/TableFile/TableFile.H | 6 +- .../functions/Polynomial/PolynomialIO.C | 4 +- .../TimeDataEntry/TimeDataEntry.H | 4 +- .../globalIndexAndTransform.C | 4 +- .../globalIndexAndTransform.H | 6 +- .../globalIndexAndTransformI.H | 4 +- .../vectorTensorTransform.C | 8 +- .../vectorTensorTransform.H | 10 +- .../vectorTensorTransformTemplates.C | 4 +- .../CompressibleTurbulenceModel.C | 4 +- .../ThermalDiffusivity/ThermalDiffusivity.C | 6 +- ...oupledTemperatureMixedFvPatchScalarField.C | 10 +- ...oupledTemperatureMixedFvPatchScalarField.H | 10 +- ...RateAdvectiveDiffusiveFvPatchScalarField.C | 6 +- ...RateAdvectiveDiffusiveFvPatchScalarField.H | 10 +- .../makeTurbulenceModel.H | 12 +- .../turbulentFluidThermoModel.H | 8 +- .../IncompressibleTurbulenceModel.C | 4 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 4 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 4 +- .../PhaseCompressibleTurbulenceModel.C | 4 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 4 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 4 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 10 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.H | 4 +- .../PhaseIncompressibleTurbulenceModel.C | 4 +- .../DeardorffDiffStress/DeardorffDiffStress.C | 8 +- .../DeardorffDiffStress/DeardorffDiffStress.H | 4 +- .../turbulenceModels/LES/LESModel/LESModel.C | 4 +- .../LES/LESeddyViscosity/LESeddyViscosity.C | 6 +- .../LES/LESeddyViscosity/LESeddyViscosity.H | 4 +- .../turbulenceModels/RAS/LRR/LRR.C | 8 +- .../turbulenceModels/RAS/LRR/LRR.H | 4 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 8 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 4 +- .../turbulenceModels/RAS/RASModel/RASModel.C | 4 +- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 8 +- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 4 +- .../turbulenceModels/RAS/SSG/SSG.C | 8 +- .../turbulenceModels/RAS/SSG/SSG.H | 4 +- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 8 +- .../RAS/SpalartAllmaras/SpalartAllmaras.H | 4 +- .../turbulenceModels/RAS/kEpsilon/kEpsilon.C | 8 +- .../turbulenceModels/RAS/kEpsilon/kEpsilon.H | 4 +- .../turbulenceModels/RAS/kOmega/kOmega.C | 8 +- .../turbulenceModels/RAS/kOmega/kOmega.H | 4 +- .../RAS/kOmegaSST/kOmegaSST.C | 8 +- .../RAS/kOmegaSST/kOmegaSST.H | 4 +- .../RAS/realizableKE/realizableKE.C | 8 +- .../RAS/realizableKE/realizableKE.H | 4 +- .../turbulenceModels/RAS/v2f/v2f.C | 8 +- .../turbulenceModels/RAS/v2f/v2f.H | 4 +- .../porousBafflePressureFvPatchField.H | 10 +- ...silonLowReWallFunctionFvPatchScalarField.C | 4 +- .../epsilonWallFunctionFvPatchScalarField.H | 4 +- .../kqRWallFunctionFvPatchField.H | 10 +- .../omegaWallFunctionFvPatchScalarField.H | 4 +- .../turbulenceModels/laminar/laminar.C | 4 +- .../singleStepCombustion.C | 4 +- src/conversion/meshReader/meshReader.H | 6 +- src/conversion/meshTables/cellTable.C | 4 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 +- ...yMotionDisplacementPointPatchVectorField.H | 10 +- .../rotatingMotion/rotatingMotion.H | 4 +- .../tabulated6DoFMotion/tabulated6DoFMotion.C | 4 +- src/dynamicMesh/boundaryMesh/boundaryMesh.C | 6 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 6 +- .../fvMeshDistribute/fvMeshDistribute.C | 36 +- .../fvMeshDistribute/fvMeshDistribute.H | 10 +- .../fvMeshDistributeTemplates.C | 6 +- .../boundaryCutter/boundaryCutter.C | 10 +- .../boundaryCutter/boundaryCutter.H | 8 +- .../meshCutAndRemove/meshCutAndRemove.C | 10 +- .../meshCutAndRemove/meshCutAndRemove.H | 6 +- .../meshModifiers/meshCutter/meshCutter.C | 10 +- .../meshModifiers/meshCutter/meshCutter.H | 6 +- .../motionSmoother/motionSmootherAlgo.C | 4 +- .../motionSmoother/motionSmootherAlgo.H | 6 +- .../motionSmootherAlgoTemplates.C | 6 +- .../polyMeshAdder/faceCoupleInfo.H | 4 +- src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 42 +- src/dynamicMesh/polyMeshAdder/polyMeshAdder.H | 26 +- .../polyTopoChange/edgeCollapser.C | 8 +- .../polyTopoChange/edgeCollapser.H | 4 +- .../polyTopoChange/polyTopoChange/hexRef8.C | 4 +- .../polyTopoChange/polyTopoChange.C | 18 +- .../polyTopoChange/polyTopoChange.H | 12 +- .../polyTopoChange/polyTopoChangeTemplates.C | 6 +- .../polyTopoChange/refinementHistory.C | 4 +- .../polyTopoChange/refinementHistory.H | 4 +- .../polyTopoChange/removePoints.C | 4 +- .../slidingInterface/coupleSlidingInterface.C | 8 +- .../enrichedPatch/enrichedPatchCutFaces.C | 8 +- .../enrichedPatch/enrichedPatchMasterPoints.C | 8 +- .../enrichedPatch/enrichedPatchPointPoints.C | 4 +- .../slidingInterface/slidingInterface.C | 8 +- .../slidingInterface/slidingInterface.H | 6 +- .../slidingInterfaceAttachedAddressing.C | 12 +- .../extendedEdgeMesh/extendedEdgeMesh.C | 8 +- .../extendedEdgeMesh/extendedEdgeMesh.H | 10 +- .../extendedEdgeMeshTemplates.C | 6 +- .../extendedFeatureEdgeMeshTemplates.C | 6 +- .../sampledSetWriters/csv/csvSetWriter.C | 4 +- .../sampledSetWriters/csv/csvSetWriter.H | 4 +- .../ensight/ensightSetWriter.C | 6 +- .../ensight/ensightSetWriter.H | 4 +- .../gnuplot/gnuplotSetWriter.C | 4 +- .../gnuplot/gnuplotSetWriter.H | 4 +- .../sampledSetWriters/jplot/jplotSetWriter.H | 4 +- .../sampledSetWriters/raw/rawSetWriter.C | 4 +- .../sampledSetWriters/raw/rawSetWriter.H | 4 +- .../sampledSetWriters/vtk/vtkSetWriter.C | 6 +- .../sampledSetWriters/vtk/vtkSetWriter.H | 4 +- src/fileFormats/sampledSetWriters/writer.C | 4 +- src/fileFormats/sampledSetWriters/writer.H | 8 +- .../xmgrace/xmgraceSetWriter.C | 4 +- .../xmgrace/xmgraceSetWriter.H | 4 +- .../cfdTools/general/MRF/MRFZone.H | 4 +- .../cfdTools/general/MRF/MRFZoneList.C | 8 +- .../cfdTools/general/MRF/MRFZoneList.H | 6 +- .../general/SRF/SRFModel/SRFModel/SRFModel.C | 12 +- .../general/SRF/SRFModel/SRFModel/SRFModel.H | 8 +- .../cfdTools/general/fvOptions/fvOptionList.H | 20 +- .../general/fvOptions/fvOptionListTemplates.C | 26 +- .../cfdTools/general/fvOptions/makeFvOption.H | 4 +- .../solutionControl/solutionControl.C | 4 +- .../basicSymmetry/basicSymmetryFvPatchField.C | 6 +- .../basicSymmetry/basicSymmetryFvPatchField.H | 14 +- .../basic/calculated/calculatedFvPatchField.C | 16 +- .../basic/calculated/calculatedFvPatchField.H | 18 +- .../basic/coupled/coupledFvPatchField.C | 16 +- .../basic/coupled/coupledFvPatchField.H | 24 +- .../directionMixedFvPatchField.C | 20 +- .../directionMixedFvPatchField.H | 14 +- .../fixedGradient/fixedGradientFvPatchField.C | 16 +- .../fixedGradient/fixedGradientFvPatchField.H | 20 +- .../basic/fixedValue/fixedValueFvPatchField.C | 12 +- .../basic/fixedValue/fixedValueFvPatchField.H | 18 +- .../basic/mixed/mixedFvPatchField.C | 14 +- .../basic/mixed/mixedFvPatchField.H | 20 +- .../basic/sliced/slicedFvPatchField.C | 26 +- .../basic/sliced/slicedFvPatchField.H | 22 +- .../basic/transform/transformFvPatchField.C | 10 +- .../basic/transform/transformFvPatchField.H | 18 +- .../zeroGradient/zeroGradientFvPatchField.C | 18 +- .../zeroGradient/zeroGradientFvPatchField.H | 22 +- .../constraint/cyclic/cyclicFvPatchField.C | 8 +- .../constraint/cyclic/cyclicFvPatchField.H | 14 +- .../cyclicACMI/cyclicACMIFvPatchField.C | 22 +- .../cyclicACMI/cyclicACMIFvPatchField.H | 28 +- .../cyclicAMI/cyclicAMIFvPatchField.C | 8 +- .../cyclicAMI/cyclicAMIFvPatchField.H | 14 +- .../cyclicSlip/cyclicSlipFvPatchField.H | 10 +- .../constraint/empty/emptyFvPatchField.H | 26 +- .../jumpCyclic/jumpCyclicFvPatchField.C | 6 +- .../jumpCyclic/jumpCyclicFvPatchField.H | 6 +- .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.C | 8 +- .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.H | 6 +- .../nonuniformTransformCyclicFvPatchField.H | 10 +- .../processor/processorFvPatchField.C | 6 +- .../processor/processorFvPatchField.H | 14 +- .../processorCyclicFvPatchField.H | 10 +- .../symmetry/symmetryFvPatchField.H | 10 +- .../symmetryPlane/symmetryPlaneFvPatchField.C | 8 +- .../symmetryPlane/symmetryPlaneFvPatchField.H | 14 +- .../constraint/wedge/wedgeFvPatchField.C | 8 +- .../constraint/wedge/wedgeFvPatchField.H | 14 +- .../derived/advective/advectiveFvPatchField.C | 4 +- .../derived/advective/advectiveFvPatchField.H | 10 +- .../codedFixedValueFvPatchField.H | 12 +- .../codedMixed/codedMixedFvPatchField.H | 12 +- ...lindricalInletVelocityFvPatchVectorField.H | 8 +- .../externalCoupledMixedFvPatchField.C | 8 +- .../externalCoupledMixedFvPatchField.H | 10 +- .../derived/fan/fanFvPatchField.H | 10 +- .../derived/fan/fanFvPatchFields.C | 4 +- .../fixedFluxPressureFvPatchScalarField.H | 4 +- .../fixedInternalValueFvPatchField.H | 10 +- .../derived/fixedJump/fixedJumpFvPatchField.C | 8 +- .../derived/fixedJump/fixedJumpFvPatchField.H | 12 +- .../fixedJumpAMI/fixedJumpAMIFvPatchField.C | 8 +- .../fixedJumpAMI/fixedJumpAMIFvPatchField.H | 12 +- .../derived/fixedMean/fixedMeanFvPatchField.H | 10 +- .../fixedNormalSlipFvPatchField.C | 8 +- .../fixedNormalSlipFvPatchField.H | 14 +- .../fixedProfile/fixedProfileFvPatchField.H | 12 +- .../flowRateInletVelocityFvPatchVectorField.H | 4 +- .../freestream/freestreamFvPatchField.H | 10 +- .../inletOutlet/inletOutletFvPatchField.H | 10 +- .../mappedField/mappedFieldFvPatchField.H | 10 +- .../mappedField/mappedPatchFieldBase.C | 8 +- .../mappedField/mappedPatchFieldBase.H | 4 +- .../mappedFixedInternalValueFvPatchField.H | 10 +- ...ppedFixedPushedInternalValueFvPatchField.H | 10 +- .../mappedFixedValueFvPatchField.H | 10 +- .../oscillatingFixedValueFvPatchField.C | 4 +- .../oscillatingFixedValueFvPatchField.H | 14 +- .../outletInlet/outletInletFvPatchField.H | 10 +- .../outletMappedUniformInletFvPatchField.H | 10 +- .../partialSlip/partialSlipFvPatchField.C | 8 +- .../partialSlip/partialSlipFvPatchField.H | 14 +- ...ureInletOutletVelocityFvPatchVectorField.H | 4 +- .../rotatingTotalPressureFvPatchScalarField.H | 4 +- .../rotatingWallVelocityFvPatchVectorField.H | 4 +- .../derived/slip/slipFvPatchField.H | 10 +- ...lFlowRateInletVelocityFvPatchVectorField.H | 6 +- .../timeVaryingMappedFixedValueFvPatchField.C | 4 +- .../timeVaryingMappedFixedValueFvPatchField.H | 12 +- .../turbulentInletFvPatchField.C | 4 +- .../turbulentInletFvPatchField.H | 10 +- .../uniformFixedGradientFvPatchField.H | 12 +- .../uniformFixedValueFvPatchField.H | 12 +- .../uniformInletOutletFvPatchField.H | 12 +- .../uniformJump/uniformJumpFvPatchField.H | 12 +- .../uniformJumpAMIFvPatchField.H | 12 +- .../uniformTotalPressureFvPatchScalarField.H | 4 +- .../variableHeightFlowRateFvPatchField.H | 10 +- .../waveTransmissiveFvPatchField.H | 10 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 6 +- .../fvPatchFields/fvPatchField/fvPatchField.H | 46 +- .../fvPatchField/fvPatchFieldNew.C | 12 +- .../calculated/calculatedFvsPatchField.C | 8 +- .../calculated/calculatedFvsPatchField.H | 10 +- .../basic/coupled/coupledFvsPatchField.H | 6 +- .../fixedValue/fixedValueFvsPatchField.C | 12 +- .../fixedValue/fixedValueFvsPatchField.H | 18 +- .../basic/sliced/slicedFvsPatchField.C | 10 +- .../basic/sliced/slicedFvsPatchField.H | 6 +- .../constraint/cyclic/cyclicFvsPatchField.H | 10 +- .../cyclicACMI/cyclicACMIFvsPatchField.H | 10 +- .../cyclicAMI/cyclicAMIFvsPatchField.H | 10 +- .../cyclicSlip/cyclicSlipFvsPatchField.H | 10 +- .../constraint/empty/emptyFvsPatchField.H | 10 +- .../nonuniformTransformCyclicFvsPatchField.H | 10 +- .../processor/processorFvsPatchField.H | 10 +- .../processorCyclicFvsPatchField.H | 10 +- .../symmetry/symmetryFvsPatchField.H | 10 +- .../symmetryPlaneFvsPatchField.H | 10 +- .../constraint/wedge/wedgeFvsPatchField.H | 10 +- .../fvsPatchField/fvsPatchField.H | 22 +- .../fvsPatchField/fvsPatchFieldNew.C | 10 +- src/finiteVolume/fields/volFields/volFields.C | 4 +- src/finiteVolume/fields/volFields/volFields.H | 4 +- .../boundedConvectionScheme.C | 10 +- .../boundedConvectionScheme.H | 12 +- .../convectionScheme/convectionScheme.C | 6 +- .../convectionScheme/convectionScheme.H | 18 +- .../gaussConvectionScheme.C | 14 +- .../gaussConvectionScheme.H | 14 +- .../multivariateGaussConvectionScheme.C | 10 +- .../multivariateGaussConvectionScheme.H | 14 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.C | 26 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.H | 12 +- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C | 4 +- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H | 16 +- .../steadyStateD2dt2Scheme.C | 22 +- .../steadyStateD2dt2Scheme.H | 12 +- .../CoEulerDdtScheme/CoEulerDdtScheme.C | 48 +- .../CoEulerDdtScheme/CoEulerDdtScheme.H | 20 +- .../CrankNicolsonDdtScheme.C | 106 ++-- .../CrankNicolsonDdtScheme.H | 20 +- .../EulerDdtScheme/EulerDdtScheme.C | 48 +- .../EulerDdtScheme/EulerDdtScheme.H | 20 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C | 48 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H | 20 +- .../backwardDdtScheme/backwardDdtScheme.C | 48 +- .../backwardDdtScheme/backwardDdtScheme.H | 20 +- .../boundedDdtScheme/boundedDdtScheme.C | 20 +- .../boundedDdtScheme/boundedDdtScheme.H | 22 +- .../ddtSchemes/ddtScheme/ddtScheme.C | 12 +- .../ddtSchemes/ddtScheme/ddtScheme.H | 24 +- .../localEulerDdtScheme/localEulerDdtScheme.C | 48 +- .../localEulerDdtScheme/localEulerDdtScheme.H | 20 +- .../steadyStateDdtScheme.C | 38 +- .../steadyStateDdtScheme.H | 20 +- .../divSchemes/divScheme/divScheme.C | 4 +- .../divSchemes/divScheme/divScheme.H | 8 +- .../finiteVolume/fvc/fvcAverage.C | 20 +- .../finiteVolume/fvc/fvcAverage.H | 14 +- .../finiteVolume/fvc/fvcCellReduce.C | 8 +- .../finiteVolume/fvc/fvcCellReduce.H | 8 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.C | 14 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.H | 8 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C | 6 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H | 6 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.C | 10 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.H | 6 +- src/finiteVolume/finiteVolume/fvc/fvcDdt.C | 24 +- src/finiteVolume/finiteVolume/fvc/fvcDdt.H | 16 +- src/finiteVolume/finiteVolume/fvc/fvcDiv.C | 56 +-- src/finiteVolume/finiteVolume/fvc/fvcDiv.H | 36 +- src/finiteVolume/finiteVolume/fvc/fvcFlux.C | 38 +- src/finiteVolume/finiteVolume/fvc/fvcFlux.H | 26 +- src/finiteVolume/finiteVolume/fvc/fvcGrad.C | 12 +- src/finiteVolume/finiteVolume/fvc/fvcGrad.H | 8 +- .../finiteVolume/fvc/fvcLaplacian.C | 116 ++--- .../finiteVolume/fvc/fvcLaplacian.H | 90 ++-- .../finiteVolume/fvc/fvcMagSqrGradGrad.C | 4 +- .../finiteVolume/fvc/fvcMagSqrGradGrad.H | 4 +- .../finiteVolume/fvc/fvcReconstruct.C | 8 +- .../finiteVolume/fvc/fvcReconstruct.H | 4 +- .../finiteVolume/fvc/fvcSimpleReconstruct.C | 8 +- src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C | 18 +- src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H | 14 +- src/finiteVolume/finiteVolume/fvc/fvcSup.C | 18 +- src/finiteVolume/finiteVolume/fvc/fvcSup.H | 18 +- .../finiteVolume/fvc/fvcSurfaceIntegrate.C | 22 +- .../finiteVolume/fvc/fvcSurfaceIntegrate.H | 14 +- .../finiteVolume/fvc/fvcVolumeIntegrate.C | 22 +- .../finiteVolume/fvc/fvcVolumeIntegrate.H | 18 +- src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C | 8 +- src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H | 8 +- src/finiteVolume/finiteVolume/fvm/fvmDdt.C | 18 +- src/finiteVolume/finiteVolume/fvm/fvmDdt.H | 18 +- src/finiteVolume/finiteVolume/fvm/fvmDiv.C | 14 +- src/finiteVolume/finiteVolume/fvm/fvmDiv.H | 10 +- .../finiteVolume/fvm/fvmLaplacian.C | 54 +-- .../finiteVolume/fvm/fvmLaplacian.H | 42 +- src/finiteVolume/finiteVolume/fvm/fvmSup.C | 50 +- src/finiteVolume/finiteVolume/fvm/fvmSup.H | 30 +- .../LeastSquaresGrad/LeastSquaresGrad.C | 8 +- .../LeastSquaresGrad/LeastSquaresGrad.H | 4 +- .../LeastSquaresGrad/LeastSquaresVectors.H | 8 +- .../gradSchemes/fourthGrad/fourthGrad.C | 6 +- .../gradSchemes/gaussGrad/gaussGrad.C | 6 +- .../gradSchemes/gaussGrad/gaussGrad.H | 8 +- .../gradSchemes/gradScheme/gradScheme.C | 6 +- .../gradSchemes/gradScheme/gradScheme.H | 8 +- .../leastSquaresGrad/leastSquaresGrad.C | 4 +- .../cellLimitedGrad/cellLimitedGrad.H | 4 +- .../cellMDLimitedGrad/cellMDLimitedGrad.H | 4 +- .../faceLimitedGrad/faceLimitedGrad.H | 4 +- .../faceMDLimitedGrad/faceMDLimitedGrad.H | 4 +- .../gaussLaplacianScheme.C | 24 +- .../gaussLaplacianScheme.H | 20 +- .../gaussLaplacianSchemes.C | 10 +- .../laplacianScheme/laplacianScheme.C | 8 +- .../laplacianScheme/laplacianScheme.H | 26 +- .../CentredFitSnGrad/CentredFitSnGradData.C | 4 +- .../CentredFitSnGrad/CentredFitSnGradScheme.H | 8 +- .../correctedSnGrad/correctedSnGrad.C | 10 +- .../correctedSnGrad/correctedSnGrad.H | 6 +- .../faceCorrectedSnGrad/faceCorrectedSnGrad.C | 10 +- .../faceCorrectedSnGrad/faceCorrectedSnGrad.H | 6 +- .../limitedSnGrad/limitedSnGrad.C | 4 +- .../limitedSnGrad/limitedSnGrad.H | 12 +- .../orthogonalSnGrad/orthogonalSnGrad.C | 6 +- .../orthogonalSnGrad/orthogonalSnGrad.H | 4 +- .../snGradSchemes/snGradScheme/snGradScheme.C | 20 +- .../snGradSchemes/snGradScheme/snGradScheme.H | 20 +- .../uncorrectedSnGrad/uncorrectedSnGrad.C | 6 +- .../uncorrectedSnGrad/uncorrectedSnGrad.H | 4 +- .../fvMatrices/fvMatrix/fvMatrix.C | 454 +++++++++--------- .../fvMatrices/fvMatrix/fvMatrix.H | 332 ++++++------- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 6 +- .../cellToCell/extendedCellToCellStencil.H | 4 +- .../extendedCellToCellStencilTemplates.C | 6 +- .../extendedCentredCellToCellStencil.C | 4 +- .../extendedCentredCellToCellStencil.H | 6 +- .../cellToFace/extendedCellToFaceStencil.H | 8 +- .../extendedCellToFaceStencilTemplates.C | 12 +- .../extendedCentredCellToFaceStencil.C | 4 +- .../extendedCentredCellToFaceStencil.H | 8 +- .../extendedUpwindCellToFaceStencil.C | 12 +- .../extendedUpwindCellToFaceStencil.H | 8 +- ...extendedUpwindCellToFaceStencilTemplates.C | 14 +- .../extendedCentredFaceToCellStencil.C | 4 +- .../extendedCentredFaceToCellStencil.H | 8 +- .../faceToCell/extendedFaceToCellStencil.H | 8 +- .../extendedFaceToCellStencilTemplates.C | 12 +- src/finiteVolume/fvMesh/fvMesh.H | 6 +- .../fvMesh/fvMeshSubset/fvMeshSubset.H | 14 +- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 26 +- .../constraint/cyclicACMI/cyclicACMIFvPatch.H | 16 +- .../constraint/cyclicAMI/cyclicAMIFvPatch.H | 8 +- .../fvMesh/fvPatches/fvPatch/fvPatch.H | 4 +- .../fvPatches/fvPatch/fvPatchTemplates.C | 6 +- .../singleCellFvMesh/singleCellFvMesh.H | 4 +- .../singleCellFvMeshInterpolate.C | 8 +- .../meshWave/meshWavePatchDistMethod.C | 4 +- .../meshWave/wallDistData/wallDistData.C | 4 +- .../wallDist/wallPointYPlus/wallPointYPlus.H | 4 +- .../interpolation/interpolation.H | 8 +- .../interpolation/interpolationNew.C | 8 +- .../limitedSchemes/LimitedScheme/LimitFuncs.H | 4 +- .../LimitedScheme/LimitedScheme.C | 6 +- .../LimitedScheme/LimitedScheme.H | 20 +- .../limitedSchemes/PhiScheme/PhiScheme.H | 10 +- .../limitedSchemes/limitWith/limitWith.H | 8 +- .../limitedSurfaceInterpolationScheme.C | 8 +- .../limitedSurfaceInterpolationScheme.H | 16 +- .../multivariateIndependentScheme.H | 4 +- .../multivariateIndependentSchemes.C | 4 +- .../multivariateScheme/multivariateScheme.H | 10 +- .../multivariateSelectionScheme.H | 6 +- .../multivariateSelectionSchemes.C | 4 +- .../multivariateSurfaceInterpolationScheme.C | 4 +- .../multivariateSurfaceInterpolationScheme.H | 8 +- .../upwind/multivariateUpwind.H | 6 +- .../schemes/CentredFitScheme/CentredFitData.C | 4 +- .../CentredFitScheme/CentredFitScheme.H | 8 +- .../schemes/CoBlended/CoBlended.H | 12 +- .../surfaceInterpolation/schemes/LUST/LUST.H | 4 +- .../PureUpwindFitScheme/PureUpwindFitScheme.H | 8 +- .../schemes/UpwindFitScheme/UpwindFitData.C | 4 +- .../schemes/UpwindFitScheme/UpwindFitScheme.H | 8 +- .../schemes/cellCoBlended/cellCoBlended.H | 12 +- .../schemes/cubic/cubic.H | 6 +- .../schemes/fixedBlended/fixedBlended.H | 12 +- .../schemes/harmonic/harmonic.H | 4 +- .../schemes/limiterBlended/limiterBlended.H | 14 +- .../schemes/linear/linear.H | 10 +- .../schemes/linearUpwind/linearUpwind.C | 6 +- .../schemes/linearUpwind/linearUpwind.H | 6 +- .../schemes/linearUpwind/linearUpwindV.C | 6 +- .../schemes/linearUpwind/linearUpwindV.H | 6 +- .../schemes/localBlended/localBlended.H | 12 +- .../schemes/localMax/localMax.H | 6 +- .../schemes/localMin/localMin.H | 6 +- .../outletStabilised/outletStabilised.H | 20 +- .../schemes/pointLinear/pointLinear.C | 6 +- .../schemes/pointLinear/pointLinear.H | 4 +- .../schemes/skewCorrected/skewCorrected.H | 12 +- .../surfaceInterpolation/surfaceInterpolate.C | 58 +-- .../surfaceInterpolation/surfaceInterpolate.H | 44 +- .../surfaceInterpolationScheme.C | 24 +- .../surfaceInterpolationScheme.H | 24 +- .../pointConstraintsTemplates.C | 6 +- .../volPointInterpolate.C | 34 +- .../volPointInterpolation.H | 18 +- .../pairPatchAgglomeration.C | 2 +- .../displacementInterpolationMotionSolver.C | 8 +- .../fvMotionSolverCoreTemplates.C | 4 +- .../cellMotion/cellMotionFvPatchField.C | 4 +- .../cellMotion/cellMotionFvPatchField.H | 10 +- .../surfaceSlipDisplacementFvPatchField.H | 10 +- ...llatingDisplacementPointPatchVectorField.H | 10 +- ...OscillatingVelocityPointPatchVectorField.H | 10 +- ...llatingDisplacementPointPatchVectorField.H | 10 +- ...oscillatingVelocityPointPatchVectorField.H | 10 +- ...meVaryingMappedFixedValuePointPatchField.C | 4 +- ...meVaryingMappedFixedValuePointPatchField.H | 12 +- ...polatedDisplacementPointPatchVectorField.H | 10 +- .../waveDisplacementPointPatchVectorField.H | 10 +- .../fixedTemperatureConstraint.H | 4 +- .../effectivenessHeatExchangerSource.H | 4 +- .../rotorDiskSource/bladeModel/bladeModel.C | 4 +- .../tabulated6DoFAcceleration.C | 4 +- .../semiImplicitSource/SemiImplicitSource.H | 8 +- .../semiImplicitSource/SemiImplicitSourceI.H | 6 +- .../interRegionHeatTransferModel.H | 6 +- .../interRegionHeatTransferModelTemplates.C | 6 +- .../tabulatedHeatTransfer.H | 4 +- .../genericFvPatchField/genericFvPatchField.C | 32 +- .../genericFvPatchField/genericFvPatchField.H | 18 +- .../genericPointPatchField.C | 24 +- .../genericPointPatchField.H | 10 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 10 +- .../clouds/Templates/DSMCCloud/DSMCCloud.H | 24 +- .../clouds/Templates/DSMCCloud/DSMCCloudI.H | 16 +- .../parcels/Templates/DSMCParcel/DSMCParcel.H | 16 +- .../Templates/DSMCParcel/DSMCParcelIO.C | 10 +- .../BinaryCollisionModel.H | 6 +- .../BinaryCollisionModelNew.C | 6 +- .../FreeStream/FreeStream.C | 8 +- .../FreeStream/FreeStream.H | 4 +- .../InflowBoundaryModel/InflowBoundaryModel.H | 6 +- .../InflowBoundaryModelNew.C | 6 +- .../WallInteractionModel.H | 6 +- .../WallInteractionModelNew.C | 6 +- src/lagrangian/basic/Cloud/Cloud.C | 6 +- src/lagrangian/basic/Cloud/CloudIO.C | 4 +- .../basic/InteractionLists/InteractionLists.C | 12 +- .../basic/InteractionLists/InteractionLists.H | 14 +- .../InteractionLists/InteractionListsI.H | 6 +- .../coalCloudList/coalCloudList.H | 12 +- .../coalCloudList/coalCloudListI.H | 22 +- .../COxidationDiffusionLimitedRate.H | 6 +- .../COxidationHurtMitchell.H | 6 +- .../COxidationIntrinsicRate.H | 6 +- .../COxidationKineticDiffusionLimitedRate.H | 6 +- .../COxidationMurphyShaddix.H | 6 +- .../IntegrationScheme/Analytical/Analytical.H | 6 +- .../IntegrationScheme/Euler/Euler.H | 6 +- .../IntegrationScheme/IntegrationScheme.H | 6 +- .../IntegrationScheme/IntegrationSchemeNew.C | 6 +- .../Templates/CollidingCloud/CollidingCloud.C | 6 +- .../Templates/CollidingCloud/CollidingCloud.H | 18 +- .../CollidingCloud/CollidingCloudI.H | 6 +- .../Templates/KinematicCloud/KinematicCloud.C | 18 +- .../Templates/KinematicCloud/KinematicCloud.H | 54 +-- .../KinematicCloud/KinematicCloudI.H | 28 +- .../cloudSolution/cloudSolution.H | 4 +- .../clouds/Templates/MPPICCloud/MPPICCloud.C | 10 +- .../clouds/Templates/MPPICCloud/MPPICCloud.H | 30 +- .../clouds/Templates/MPPICCloud/MPPICCloudI.H | 14 +- .../Templates/ReactingCloud/ReactingCloud.C | 10 +- .../Templates/ReactingCloud/ReactingCloud.H | 32 +- .../Templates/ReactingCloud/ReactingCloudI.H | 20 +- .../ReactingMultiphaseCloud.C | 10 +- .../ReactingMultiphaseCloud.H | 16 +- .../Templates/ThermoCloud/ThermoCloud.C | 8 +- .../Templates/ThermoCloud/ThermoCloud.H | 26 +- .../Templates/ThermoCloud/ThermoCloudI.H | 4 +- .../basicKinematicCloud/basicKinematicCloud.H | 4 +- .../CollidingParcel/CollidingParcel.H | 6 +- .../CollisionRecordList/CollisionRecordList.C | 6 +- .../CollisionRecordList/CollisionRecordList.H | 10 +- .../CollisionRecordListI.H | 6 +- .../KinematicParcel/KinematicParcel.H | 12 +- .../Templates/MPPICParcel/MPPICParcel.H | 20 +- .../MPPICParcel/MPPICParcelTrackingDataI.H | 4 +- .../ReactingMultiphaseParcel.H | 6 +- .../ReactingMultiphaseParcelIO.C | 16 +- .../Templates/ReactingParcel/ReactingParcel.H | 8 +- .../ReactingParcel/ReactingParcelIO.C | 12 +- .../Templates/ThermoParcel/ThermoParcel.H | 14 +- .../Templates/ThermoParcel/ThermoParcelIO.C | 6 +- .../basicKinematicCollidingParcel.H | 4 +- .../basicKinematicMPPICParcel.H | 4 +- .../basicReactingParcel/basicReactingParcel.H | 4 +- .../basicThermoParcel/basicThermoParcel.H | 4 +- .../CloudFunctionObject/CloudFunctionObject.H | 10 +- .../CloudFunctionObjectNew.C | 6 +- .../CloudFunctionObjectList.C | 8 +- .../CloudFunctionObjectList.H | 4 +- .../FacePostProcessing/FacePostProcessing.H | 6 +- .../ParticleCollector/ParticleCollector.C | 10 +- .../ParticleCollector/ParticleCollector.H | 10 +- .../ParticleErosion/ParticleErosion.H | 6 +- .../ParticleTracks/ParticleTracks.H | 10 +- .../ParticleTrap/ParticleTrap.H | 6 +- .../PatchPostProcessing/PatchPostProcessing.C | 14 +- .../PatchPostProcessing/PatchPostProcessing.H | 10 +- .../VoidFraction/VoidFraction.H | 6 +- .../ParticleForceList/ParticleForceList.C | 8 +- .../ParticleForceList/ParticleForceList.H | 4 +- .../CollisionModel/CollisionModel.H | 8 +- .../CollisionModel/CollisionModelNew.C | 6 +- .../CollisionModel/NoCollision/NoCollision.H | 6 +- .../PairCollision/PairCollision.C | 20 +- .../PairCollision/PairCollision.H | 14 +- .../PairModel/PairModel/PairModel.H | 6 +- .../PairModel/PairModel/PairModelNew.C | 6 +- .../WallLocalSpringSliderDashpot.C | 6 +- .../WallLocalSpringSliderDashpot.H | 6 +- .../WallModel/WallModel/WallModel.H | 10 +- .../WallModel/WallModel/WallModelNew.C | 6 +- .../WallSpringSliderDashpot.C | 6 +- .../WallSpringSliderDashpot.H | 6 +- .../DispersionModel/DispersionModel.H | 8 +- .../DispersionModel/DispersionModelNew.C | 6 +- .../NoDispersion/NoDispersion.H | 6 +- .../CellZoneInjection/CellZoneInjection.H | 6 +- .../ConeInjection/ConeInjection.H | 8 +- .../ConeNozzleInjection/ConeNozzleInjection.H | 6 +- .../FieldActivatedInjection.H | 6 +- .../InflationInjection/InflationInjection.C | 10 +- .../InflationInjection/InflationInjection.H | 8 +- .../InjectionModel/InjectionModel.H | 10 +- .../InjectionModel/InjectionModelList.C | 8 +- .../InjectionModel/InjectionModelList.H | 8 +- .../InjectionModel/InjectionModelNew.C | 10 +- .../KinematicLookupTableInjection.H | 6 +- .../ManualInjection/ManualInjection.H | 6 +- .../InjectionModel/NoInjection/NoInjection.H | 6 +- .../PatchFlowRateInjection.H | 6 +- .../PatchInjection/PatchInjection.H | 6 +- .../DistortedSphereDragForce.H | 6 +- .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H | 6 +- .../Drag/NonSphereDrag/NonSphereDragForce.H | 6 +- .../PlessisMasliyahDragForce.H | 6 +- .../Drag/SphereDrag/SphereDragForce.H | 6 +- .../Drag/WenYuDrag/WenYuDragForce.H | 6 +- .../ParticleForces/Gravity/GravityForce.H | 6 +- .../ParticleForces/Lift/LiftForce/LiftForce.H | 8 +- .../Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H | 6 +- .../Lift/TomiyamaLift/TomiyamaLiftForce.H | 6 +- .../NonInertialFrame/NonInertialFrameForce.H | 6 +- .../Paramagnetic/ParamagneticForce.H | 6 +- .../ParticleForce/ParticleForce.H | 10 +- .../ParticleForce/ParticleForceNew.C | 6 +- .../PressureGradient/PressureGradientForce.H | 8 +- .../Kinematic/ParticleForces/SRF/SRFForce.H | 6 +- .../VirtualMass/VirtualMassForce.H | 6 +- .../LocalInteraction/LocalInteraction.H | 6 +- .../MultiInteraction/MultiInteraction.H | 8 +- .../NoInteraction/NoInteraction.H | 6 +- .../PatchInteractionModel.H | 8 +- .../PatchInteractionModelNew.C | 6 +- .../PatchInteractionModel/Rebound/Rebound.H | 6 +- .../StandardWallInteraction.H | 6 +- .../NoStochasticCollision.H | 6 +- .../StochasticCollisionModel.H | 8 +- .../StochasticCollisionModelNew.C | 6 +- .../NoSurfaceFilm/NoSurfaceFilm.H | 6 +- .../SurfaceFilmModel/SurfaceFilmModel.H | 8 +- .../SurfaceFilmModel/SurfaceFilmModelNew.C | 6 +- .../AveragingMethod/AveragingMethod.C | 6 +- .../AveragingMethod/AveragingMethod.H | 16 +- .../AveragingMethod/AveragingMethodI.H | 10 +- .../MPPIC/AveragingMethods/Basic/Basic.C | 6 +- .../MPPIC/AveragingMethods/Basic/Basic.H | 10 +- .../MPPIC/AveragingMethods/Dual/Dual.C | 6 +- .../MPPIC/AveragingMethods/Dual/Dual.H | 10 +- .../MPPIC/AveragingMethods/Moment/Moment.C | 6 +- .../MPPIC/AveragingMethods/Moment/Moment.H | 10 +- .../AveragingMethods/makeAveragingMethods.C | 14 +- .../DampingModels/DampingModel/DampingModel.C | 6 +- .../DampingModels/DampingModel/DampingModel.H | 8 +- .../MPPIC/DampingModels/NoDamping/NoDamping.H | 6 +- .../DampingModels/Relaxation/Relaxation.C | 12 +- .../DampingModels/Relaxation/Relaxation.H | 8 +- .../IsotropyModel/IsotropyModel.C | 6 +- .../IsotropyModel/IsotropyModel.H | 8 +- .../IsotropyModels/NoIsotropy/NoIsotropy.H | 6 +- .../IsotropyModels/Stochastic/Stochastic.C | 20 +- .../IsotropyModels/Stochastic/Stochastic.H | 6 +- .../MPPIC/PackingModels/Explicit/Explicit.C | 10 +- .../MPPIC/PackingModels/Explicit/Explicit.H | 8 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 6 +- .../MPPIC/PackingModels/Implicit/Implicit.H | 6 +- .../MPPIC/PackingModels/NoPacking/NoPacking.H | 6 +- .../PackingModels/PackingModel/PackingModel.C | 6 +- .../PackingModels/PackingModel/PackingModel.H | 8 +- .../HarrisCrighton/HarrisCrighton.C | 8 +- .../HarrisCrighton/HarrisCrighton.H | 8 +- .../MPPIC/ParticleStressModels/Lun/Lun.C | 12 +- .../MPPIC/ParticleStressModels/Lun/Lun.H | 6 +- .../ParticleStressModel/ParticleStressModel.C | 6 +- .../ParticleStressModel/ParticleStressModel.H | 8 +- .../exponential/exponential.C | 6 +- .../exponential/exponential.H | 6 +- .../TimeScaleModel/TimeScaleModel.H | 4 +- .../TimeScaleModels/equilibrium/equilibrium.C | 4 +- .../TimeScaleModels/equilibrium/equilibrium.H | 4 +- .../TimeScaleModels/isotropic/isotropic.C | 4 +- .../TimeScaleModels/isotropic/isotropic.H | 4 +- .../nonEquilibrium/nonEquilibrium.C | 4 +- .../nonEquilibrium/nonEquilibrium.H | 4 +- .../CompositionModel/CompositionModel.H | 8 +- .../CompositionModel/CompositionModelNew.C | 6 +- .../NoComposition/NoComposition.H | 6 +- .../SingleMixtureFraction.H | 6 +- .../SinglePhaseMixture/SinglePhaseMixture.H | 6 +- .../ReactingLookupTableInjection.H | 6 +- .../LiquidEvaporation/LiquidEvaporation.H | 6 +- .../LiquidEvaporationBoil.H | 6 +- .../NoPhaseChange/NoPhaseChange.H | 6 +- .../PhaseChangeModel/PhaseChangeModel.H | 8 +- .../PhaseChangeModel/PhaseChangeModelNew.C | 6 +- .../ConstantRateDevolatilisation.H | 8 +- .../DevolatilisationModel.H | 8 +- .../DevolatilisationModelNew.C | 6 +- .../NoDevolatilisation/NoDevolatilisation.H | 6 +- .../SingleKineticRateDevolatilisation.H | 6 +- .../ReactingMultiphaseLookupTableInjection.H | 6 +- .../SuppressionCollision.H | 6 +- .../NoSurfaceReaction/NoSurfaceReaction.H | 6 +- .../SurfaceReactionModel.H | 8 +- .../SurfaceReactionModelNew.C | 6 +- .../HeatTransferModel/HeatTransferModel.H | 8 +- .../HeatTransferModel/HeatTransferModelNew.C | 6 +- .../NoHeatTransfer/NoHeatTransfer.H | 6 +- .../RanzMarshall/RanzMarshall.H | 6 +- .../ThermoLookupTableInjection.H | 6 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 6 +- .../distribution/distribution.C | 20 +- .../distribution/distribution.H | 12 +- .../molecule/mdTools/calculateMDFields.H | 2 +- .../molecule/moleculeCloud/moleculeCloud.C | 6 +- .../molecule/moleculeCloud/moleculeCloud.H | 6 +- .../molecule/moleculeCloud/moleculeCloudI.H | 4 +- .../pairPotential/basic/pairPotential.C | 4 +- .../pairPotential/basic/pairPotential.H | 6 +- .../pairPotential/basic/pairPotentialIO.C | 4 +- .../clouds/Templates/SprayCloud/SprayCloud.C | 8 +- .../clouds/Templates/SprayCloud/SprayCloud.H | 24 +- .../clouds/Templates/SprayCloud/SprayCloudI.H | 10 +- .../Templates/SprayParcel/SprayParcel.H | 6 +- .../Templates/SprayParcel/SprayParcelIO.C | 6 +- .../AtomizationModel/AtomizationModel.H | 8 +- .../AtomizationModel/AtomizationModelNew.C | 6 +- .../BlobsSheetAtomization.H | 6 +- .../LISAAtomization/LISAAtomization.H | 6 +- .../NoAtomization/NoAtomization.H | 6 +- .../BreakupModel/BreakupModel/BreakupModel.H | 8 +- .../BreakupModel/BreakupModelNew.C | 6 +- .../spray/submodels/BreakupModel/ETAB/ETAB.H | 6 +- .../BreakupModel/NoBreakup/NoBreakup.H | 6 +- .../BreakupModel/PilchErdman/PilchErdman.H | 6 +- .../BreakupModel/ReitzDiwakar/ReitzDiwakar.H | 6 +- .../BreakupModel/ReitzKHRT/ReitzKHRT.H | 6 +- .../spray/submodels/BreakupModel/SHF/SHF.H | 6 +- .../spray/submodels/BreakupModel/TAB/TAB.H | 6 +- .../ORourkeCollision/ORourkeCollision.H | 6 +- .../TrajectoryCollision/TrajectoryCollision.H | 6 +- .../DispersionRASModel/DispersionRASModel.H | 4 +- .../GradientDispersionRAS.H | 6 +- .../StochasticDispersionRAS.H | 6 +- .../BrownianMotion/BrownianMotionForce.H | 6 +- .../autoHexMeshDriver/autoLayerDriverShrink.C | 10 +- .../autoHexMeshDriver/autoSnapDriver.H | 62 +-- .../autoHexMeshDriver/autoSnapDriverFeature.C | 80 +-- .../medialAxisMeshMover.C | 14 +- .../zeroFixedValuePointPatchField.H | 10 +- .../meshRefinement/meshRefinement.C | 8 +- .../meshRefinement/meshRefinement.H | 8 +- .../refinementFeatures/refinementFeatures.C | 12 +- .../refinementFeatures/refinementFeatures.H | 14 +- .../refinementSurfaces/refinementSurfaces.C | 20 +- .../autoHexMesh/shellSurfaces/shellSurfaces.C | 4 +- .../autoHexMesh/shellSurfaces/shellSurfaces.H | 4 +- .../trackedParticle/trackedParticle.H | 6 +- .../blockMesh/blockMesh/blockMeshMergeFast.C | 8 +- src/mesh/extrudeModel/radial/radial.H | 4 +- .../AMIInterpolation/AMIInterpolation.C | 36 +- .../AMIInterpolation/AMIInterpolation.H | 26 +- .../AMIInterpolationParallelOps.C | 4 +- .../AMIMethod/AMIMethod/AMIMethod.H | 4 +- .../AMIMethod/AMIMethod/AMIMethodNew.C | 6 +- .../AMIMethod/directAMI/directAMI.C | 6 +- .../faceAreaWeightAMI/faceAreaWeightAMI.C | 34 +- .../faceAreaWeightAMI/faceAreaWeightAMI.H | 26 +- .../AMIMethod/mapNearestAMI/mapNearestAMI.C | 8 +- .../AMIMethod/mapNearestAMI/mapNearestAMI.H | 4 +- .../partialFaceAreaWeightAMI.C | 10 +- .../cyclicACMIPointPatchField.C | 6 +- .../cyclicACMIPointPatchField.H | 14 +- .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.H | 10 +- .../cyclicACMIPolyPatchTemplates.C | 10 +- .../cyclicAMIPointPatchField.C | 6 +- .../cyclicAMIPointPatchField.H | 14 +- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.H | 8 +- .../cyclicAMIPolyPatchTemplates.C | 8 +- .../cellDist/patchWave/patchDataWave.C | 4 +- .../cellDist/patchWave/patchDataWave.H | 6 +- .../cellDist/wallPoint/wallPointData.H | 16 +- src/meshTools/cellFeatures/cellFeatures.H | 6 +- .../coordinateSystems/coordinateSystems.C | 4 +- .../coordinateSystems/coordinateSystems.H | 4 +- .../indexedOctree/treeDataPrimitivePatch.C | 14 +- .../indexedOctree/treeDataPrimitivePatch.H | 6 +- .../indexedOctree/treeDataTriSurface.C | 4 +- .../indexedOctree/treeDataTriSurface.H | 4 +- .../mappedPolyPatch/mappedPatchBase.H | 4 +- src/meshTools/meshSearch/meshSearch.H | 6 +- .../regionCoupledBase.H | 8 +- .../regionCoupledBaseTemplates.C | 8 +- .../searchableSurface/searchableBox.C | 4 +- .../searchableSurface/searchableBox.H | 4 +- .../searchableSurface/searchableCylinder.C | 4 +- .../searchableSurface/searchableCylinder.H | 4 +- .../searchableSurface/searchableDisk.C | 4 +- .../searchableSurface/searchableDisk.H | 4 +- .../searchableSurface/searchablePlane.C | 4 +- .../searchableSurface/searchablePlane.H | 4 +- .../searchableSurface/searchablePlate.C | 4 +- .../searchableSurface/searchablePlate.H | 4 +- .../searchableSurface/searchableSphere.C | 4 +- .../searchableSurface/searchableSphere.H | 4 +- .../searchableSurface/searchableSurface.H | 4 +- .../searchableSurfaceCollection.C | 18 +- .../searchableSurfaceCollection.H | 6 +- .../searchableSurfaceWithGaps.C | 4 +- .../searchableSurfaceWithGaps.H | 4 +- .../searchableSurface/searchableSurfaces.C | 8 +- .../searchableSurface/searchableSurfaces.H | 8 +- .../searchableSurfacesQueries.C | 8 +- .../searchableSurfacesQueries.H | 6 +- .../searchableSurface/triSurfaceMesh.C | 4 +- .../searchableSurface/triSurfaceMesh.H | 6 +- .../intersectedSurface/edgeSurface.C | 4 +- .../intersectedSurface/intersectedSurface.C | 22 +- .../intersectedSurface/intersectedSurface.H | 12 +- .../surfaceIntersection/edgeIntersections.C | 12 +- .../surfaceIntersection/edgeIntersections.H | 6 +- .../surfaceIntersection/surfaceIntersection.C | 16 +- .../surfaceIntersection/surfaceIntersection.H | 10 +- .../surfaceIntersectionFuncs.C | 4 +- .../surfaceIntersectionTemplates.C | 6 +- .../orientedSurface/orientedSurface.C | 4 +- .../triSurfaceSearch/triSurfaceSearch.C | 4 +- .../triSurfaceSearch/triSurfaceSearch.H | 6 +- .../pointToPointPlanarInterpolation.H | 12 +- ...pointToPointPlanarInterpolationTemplates.C | 6 +- .../triSurfaceTools/triSurfaceTools.C | 24 +- .../triSurfaceTools/triSurfaceTools.H | 24 +- .../decompose/decompose/fvFieldDecomposer.H | 6 +- .../fvFieldDecomposerDecomposeFields.C | 14 +- .../decompositionMethod/decompositionMethod.C | 4 +- .../multiLevelDecomp/multiLevelDecomp.C | 4 +- .../distributedTriSurfaceMesh.C | 16 +- .../distributedTriSurfaceMesh.H | 10 +- .../reconstruct/fvFieldReconstructor.H | 20 +- .../fvFieldReconstructorReconstructFields.C | 36 +- .../reconstruct/pointFieldReconstructor.H | 4 +- ...pointFieldReconstructorReconstructFields.C | 10 +- .../reconstruct/reconstructLagrangian.H | 6 +- .../reconstruct/reconstructLagrangianFields.C | 16 +- .../reconstructLagrangianPositions.C | 4 +- .../IO/partialWrite/partialWrite.H | 10 +- .../IO/partialWrite/partialWriteTemplates.C | 10 +- .../field/fieldValues/cellSource/cellSource.H | 6 +- .../cellSource/cellSourceTemplates.C | 10 +- .../field/fieldValues/faceSource/faceSource.H | 8 +- .../faceSource/faceSourceTemplates.C | 18 +- .../field/fieldValues/fieldValue/fieldValue.H | 4 +- .../fieldValue/fieldValueTemplates.C | 10 +- .../field/nearWallFields/findCellParticle.H | 12 +- .../field/nearWallFields/nearWallFields.C | 4 +- .../field/nearWallFields/nearWallFields.H | 10 +- .../nearWallFields/nearWallFieldsTemplates.C | 6 +- .../field/readFields/readFields.H | 6 +- .../field/readFields/readFieldsTemplates.C | 6 +- .../regionSizeDistribution.H | 4 +- .../field/streamLine/streamLine.C | 10 +- .../field/streamLine/streamLine.H | 12 +- .../field/streamLine/streamLineParticle.H | 28 +- .../surfaceInterpolateFields.H | 6 +- .../surfaceInterpolateFieldsTemplates.C | 4 +- .../wallBoundedStreamLine.C | 10 +- .../wallBoundedStreamLine.H | 12 +- .../wallBoundedStreamLineParticle.H | 24 +- .../forces/forceCoeffs/forceCoeffs.C | 4 +- .../functionObjects/forces/forces/forces.C | 10 +- .../functionObjects/forces/forces/forces.H | 6 +- .../blendingFactor/blendingFactorTemplates.C | 10 +- .../utilities/residuals/residualsTemplates.C | 4 +- .../setTimeStep/setTimeStepFunctionObject.H | 4 +- .../timeActivatedFileUpdate.H | 4 +- .../turbulenceFields/turbulenceFields.H | 4 +- .../turbulenceFieldsTemplates.C | 4 +- .../energyRegionCoupledFvPatchScalarField.C | 4 +- .../energyRegionCoupledFvPatchScalarField.H | 10 +- .../regionModel/regionModel/regionModel.H | 10 +- .../regionModel/regionModelTemplates.C | 18 +- ...linedFilmNusseltHeightFvPatchScalarField.H | 8 +- ...lmNusseltInletVelocityFvPatchVectorField.H | 8 +- .../kinematicSingleLayer.C | 14 +- .../kinematicSingleLayer.H | 8 +- .../surfaceFilmModels/noFilm/noFilm.C | 14 +- .../surfaceFilmModels/noFilm/noFilm.H | 8 +- .../curvatureSeparation/curvatureSeparation.C | 6 +- .../curvatureSeparation/curvatureSeparation.H | 4 +- .../surfaceFilmModel/surfaceFilmModel.C | 14 +- .../surfaceFilmModel/surfaceFilmModel.H | 8 +- .../thermoSingleLayer/thermoSingleLayer.C | 16 +- .../thermoSingleLayer/thermoSingleLayer.H | 8 +- src/sampling/cuttingPlane/cuttingPlane.H | 6 +- .../cuttingPlane/cuttingPlaneTemplates.C | 12 +- .../cellVolumeWeight/cellVolumeWeightMethod.C | 10 +- .../calcMethod/direct/directMethod.C | 6 +- .../calcMethod/mapNearest/mapNearestMethod.C | 8 +- .../calcMethod/mapNearest/mapNearestMethod.H | 4 +- src/sampling/meshToMesh/meshToMesh.C | 4 +- src/sampling/meshToMesh/meshToMesh.H | 50 +- .../meshToMesh/meshToMeshParallelOps.C | 6 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 62 +-- src/sampling/meshToMesh0/meshToMesh0.H | 12 +- .../meshToMesh0/meshToMesh0Templates.C | 20 +- src/sampling/probes/patchProbes.H | 8 +- src/sampling/probes/patchProbesTemplates.C | 18 +- src/sampling/probes/probes.H | 10 +- src/sampling/probes/probesTemplates.C | 24 +- .../sampledSet/sampledSets/sampledSets.C | 8 +- .../sampledSet/sampledSets/sampledSets.H | 10 +- .../sampledSets/sampledSetsTemplates.C | 34 +- .../distanceSurface/distanceSurface.H | 6 +- .../distanceSurfaceTemplates.C | 12 +- .../sampledSurface/isoSurface/isoSurface.C | 12 +- .../sampledSurface/isoSurface/isoSurface.H | 14 +- .../isoSurface/isoSurfaceCell.C | 12 +- .../isoSurface/isoSurfaceCell.H | 14 +- .../isoSurface/isoSurfaceCellTemplates.C | 10 +- .../isoSurface/isoSurfaceTemplates.C | 16 +- .../isoSurface/sampledIsoSurface.H | 6 +- .../isoSurface/sampledIsoSurfaceCell.H | 6 +- .../sampledIsoSurfaceCellTemplates.C | 10 +- .../isoSurface/sampledIsoSurfaceTemplates.C | 14 +- .../sampledCuttingPlane/sampledCuttingPlane.H | 6 +- .../sampledCuttingPlaneTemplates.C | 14 +- .../sampledPatch/sampledPatch.H | 8 +- .../sampledPatch/sampledPatchTemplates.C | 14 +- .../sampledPatchInternalField.H | 6 +- .../sampledPatchInternalFieldTemplates.C | 8 +- .../sampledPlane/sampledPlane.H | 6 +- .../sampledPlane/sampledPlaneTemplates.C | 10 +- .../sampledSurface/sampledSurface.C | 22 +- .../sampledSurface/sampledSurface.H | 22 +- .../sampledSurface/sampledSurfaceTemplates.C | 18 +- .../sampledSurfacesTemplates.C | 10 +- .../sampledTriSurfaceMesh.H | 8 +- .../sampledTriSurfaceMeshTemplates.C | 10 +- .../sampledThresholdCellFaces.H | 6 +- .../sampledThresholdCellFacesTemplates.C | 10 +- .../writers/nastran/nastranSurfaceWriter.C | 8 +- .../writers/nastran/nastranSurfaceWriter.H | 4 +- .../nastran/nastranSurfaceWriterTemplates.C | 4 +- ...gidBodyDisplacementPointPatchVectorField.H | 10 +- ...gidBodyDisplacementPointPatchVectorField.H | 10 +- src/surfMesh/MeshedSurface/MeshedSurface.C | 18 +- src/surfMesh/MeshedSurface/MeshedSurface.H | 22 +- .../MeshedSurface/MeshedSurfaceZones.C | 6 +- .../MeshedSurfaceIOAllocator.C | 6 +- .../MeshedSurfaceIOAllocator.H | 4 +- .../UnsortedMeshedSurface.C | 24 +- .../UnsortedMeshedSurface.H | 24 +- .../UnsortedMeshedSurfaceNew.C | 4 +- src/surfMesh/surfMesh/surfMesh.C | 8 +- src/surfMesh/surfMesh/surfMesh.H | 6 +- .../surfaceFormats/ac3d/AC3DsurfaceFormat.H | 6 +- .../surfaceFormats/ftr/FTRsurfaceFormat.H | 6 +- .../surfaceFormats/gts/GTSsurfaceFormat.H | 6 +- .../surfaceFormats/nas/NASsurfaceFormat.H | 6 +- .../surfaceFormats/obj/OBJsurfaceFormat.H | 6 +- .../surfaceFormats/off/OFFsurfaceFormat.H | 6 +- .../surfaceFormats/ofs/OFSsurfaceFormat.H | 6 +- .../starcd/STARCDsurfaceFormat.H | 6 +- .../surfaceFormats/stl/STLsurfaceFormat.H | 6 +- .../surfaceFormats/tri/TRIsurfaceFormat.H | 6 +- .../surfaceFormats/vtk/VTKsurfaceFormat.H | 6 +- .../energyJump/energyJumpFvPatchScalarField.H | 10 +- .../energyJumpAMIFvPatchScalarField.H | 10 +- .../basicChemistryModel/basicChemistryModel.H | 4 +- .../chemistryModel/chemistryModel.C | 8 +- .../chemistryModel/chemistryModel.H | 12 +- .../chemistryModel/chemistryModelI.H | 6 +- .../makeChemistrySolverTypes.H | 4 +- .../RaviPetersen/RaviPetersen.C | 4 +- .../RaviPetersen/RaviPetersen.H | 8 +- .../radiation/radiationModels/P1/P1.C | 4 +- .../radiation/radiationModels/P1/P1.H | 4 +- .../blackBodyEmission/blackBodyEmission.C | 4 +- .../blackBodyEmission/blackBodyEmission.H | 4 +- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 4 +- .../radiationModels/fvDOM/fvDOM/fvDOM.H | 6 +- .../radiationModels/noRadiation/noRadiation.C | 6 +- .../radiationModels/noRadiation/noRadiation.H | 4 +- .../radiationModels/opaqueSolid/opaqueSolid.C | 6 +- .../radiationModels/opaqueSolid/opaqueSolid.H | 4 +- .../radiationModel/radiationModel.H | 4 +- .../radiationModels/viewFactor/viewFactor.C | 6 +- .../radiationModels/viewFactor/viewFactor.H | 4 +- .../greyMeanAbsorptionEmission.H | 4 +- .../greyMeanSolidAbsorptionEmission.H | 4 +- .../mixtureFractionSoot/mixtureFractionSoot.C | 4 +- .../chemistryReader/chemistryReader.C | 6 +- .../chemistryReader/chemistryReader.H | 4 +- .../chemkinReader/chemkinLexer.L | 6 +- .../chemkinReader/chemkinReader.H | 6 +- .../reactingMixture/reactingMixture.C | 12 +- .../reactingMixture/reactingMixture.H | 12 +- .../singleStepReactingMixture.C | 4 +- .../basicSolidChemistryModel.C | 6 +- .../basicSolidChemistryModel.H | 8 +- .../pyrolysisChemistryModel.H | 8 +- .../pyrolysisChemistryModelI.H | 8 +- .../solidChemistryModel/solidChemistryModel.H | 12 +- .../solidChemistryModelI.H | 10 +- .../makeSolidChemistrySolverType.H | 4 +- .../Reactions/solidReaction/solidReaction.H | 10 +- .../const/constAnIsoSolidTransportI.H | 6 +- .../transport/const/constIsoSolidTransportI.H | 6 +- .../exponential/exponentialSolidTransportI.H | 6 +- .../polynomial/polynomialSolidTransportI.H | 14 +- .../equationOfState/Boussinesq/BoussinesqI.H | 14 +- .../PengRobinsonGas/PengRobinsonGasI.H | 12 +- .../adiabaticPerfectFluidI.H | 14 +- .../icoPolynomial/icoPolynomialI.H | 14 +- .../incompressiblePerfectGasI.H | 14 +- .../specie/equationOfState/linear/linearI.H | 14 +- .../perfectFluid/perfectFluidI.H | 14 +- .../equationOfState/perfectGas/perfectGasI.H | 14 +- .../equationOfState/rhoConst/rhoConstI.H | 10 +- .../IrreversibleReaction.H | 10 +- .../NonEquilibriumReversibleReaction.H | 10 +- .../reaction/Reactions/Reaction/Reaction.C | 14 +- .../reaction/Reactions/Reaction/Reaction.H | 14 +- .../Reactions/ReactionList/ReactionList.C | 12 +- .../Reactions/ReactionList/ReactionList.H | 4 +- .../ReversibleReaction/ReversibleReaction.H | 10 +- .../thirdBodyEfficienciesI.H | 6 +- .../specie/thermo/eConst/eConstThermoI.H | 14 +- .../specie/thermo/hConst/hConstThermoI.H | 14 +- .../specie/thermo/hPower/hPowerThermoI.H | 14 +- .../thermo/hRefConst/hRefConstThermoI.H | 14 +- .../specie/thermo/thermo/thermo.H | 6 +- .../specie/thermo/thermo/thermoI.H | 14 +- .../specie/transport/const/constTransportI.H | 14 +- .../polynomial/polynomialTransportI.H | 14 +- .../sutherland/sutherlandTransportI.H | 14 +- ...ndentAlphaContactAngleFvPatchScalarField.H | 4 +- .../triSurface/interfaces/VTK/readVTK.C | 4 +- src/triSurface/triSurface/triSurface.C | 6 +- src/triSurface/triSurface/triSurface.H | 6 +- .../ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C | 4 +- 1426 files changed, 8375 insertions(+), 8375 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index e09c1bbd14..ebc92684a4 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon const word& modelName ) : - Foam::RASModels::kEpsilon > + Foam::RASModels::kEpsilon> ( geometricOneField(), rho, diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H index 8ad1161871..e9f1a73279 100644 --- a/applications/solvers/combustion/PDRFoam/bEqn.H +++ b/applications/solvers/combustion/PDRFoam/bEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H index 87bfaa9790..c0f7dcad9c 100644 --- a/applications/solvers/combustion/XiFoam/ftEqn.H +++ b/applications/solvers/combustion/XiFoam/ftEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H index e5e7de6496..9b9d0f376b 100644 --- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H +++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H @@ -25,7 +25,7 @@ fvMesh mesh runTime, IOobject::READ_IF_PRESENT ), - xferMove >(points), + xferMove>(points), faces.xfer(), owner.xfer(), neighbour.xfer() diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index da485e7305..cee98e2429 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H index c8d34cf1d5..8cb5664d5a 100644 --- a/applications/solvers/combustion/reactingFoam/YEqn.H +++ b/applications/solvers/combustion/reactingFoam/YEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C index 18155d5bca..d65d3943f9 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,7 +119,7 @@ void Foam::mixedFixedValueSlipFvPatchField::rmap transformFvPatchField::rmap(ptf, addr); const mixedFixedValueSlipFvPatchField& dmptf = - refCast >(ptf); + refCast>(ptf); refValue_.rmap(dmptf.refValue_, addr); valueFraction_.rmap(dmptf.valueFraction_, addr); @@ -127,7 +127,7 @@ void Foam::mixedFixedValueSlipFvPatchField::rmap template -Foam::tmp > +Foam::tmp> Foam::mixedFixedValueSlipFvPatchField::snGrad() const { tmp nHat = this->patch().nf(); @@ -167,7 +167,7 @@ void Foam::mixedFixedValueSlipFvPatchField::evaluate template -Foam::tmp > +Foam::tmp> Foam::mixedFixedValueSlipFvPatchField::snGradTransformDiag() const { vectorField nHat(this->patch().nf()); diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H index d27b722a93..8c98fb5f83 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,9 +101,9 @@ public: ); //- Construct and return a clone - virtual tmp > clone() const + virtual tmp> clone() const { - return tmp > + return tmp> ( new mixedFixedValueSlipFvPatchField(*this) ); @@ -117,12 +117,12 @@ public: ); //- Construct and return a clone setting internal field reference - virtual tmp > clone + virtual tmp> clone ( const DimensionedField& iF ) const { - return tmp > + return tmp> ( new mixedFixedValueSlipFvPatchField(*this, iF) ); @@ -170,7 +170,7 @@ public: // Evaluation functions //- Return gradient at boundary - virtual tmp > snGrad() const; + virtual tmp> snGrad() const; //- Evaluate the patch field virtual void evaluate @@ -179,7 +179,7 @@ public: ); //- Return face-gradient transform diagonal - virtual tmp > snGradTransformDiag() const; + virtual tmp> snGradTransformDiag() const; //- Write diff --git a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H index 7f4b6cd7b8..7d361ac9f8 100644 --- a/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H +++ b/applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H @@ -3,14 +3,14 @@ namespace Foam //- Interpolate field vf according to direction dir template -tmp > interpolate +tmp> interpolate ( const GeometricField& vf, const surfaceScalarField& dir, const word& reconFieldName = word::null ) { - tmp > tsf + tmp> tsf ( fvc::interpolate ( diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index 9e34895a73..6c08de4b8e 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -151,7 +151,7 @@ alphac.correctBoundaryConditions(); surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac)); surfaceScalarField alphaPhic("alphaPhic", alphacf*phic); -autoPtr > +autoPtr> continuousPhaseTurbulence ( PhaseIncompressibleTurbulenceModel::New diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H index a719c83cd7..671e316c54 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H index b23f00dbf1..93dacc3ba6 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H index fbcc0a0f65..25bdc12cdf 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H index cd0a45f0f0..20d55a8d52 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H @@ -1,4 +1,4 @@ -tmp > mvConvection +tmp> mvConvection ( fv::convectionScheme::New ( diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H index 6a24830137..055aac3966 100644 --- a/applications/solvers/multiphase/interFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interFoam/alphaEqn.H @@ -2,7 +2,7 @@ word alphaScheme("div(phi,alpha)"); word alpharScheme("div(phirb,alpha)"); - tmp > ddtAlpha + tmp> ddtAlpha ( fv::ddtScheme::New ( @@ -15,13 +15,13 @@ scalar ocCoeff = 0; if ( - isType >(ddtAlpha()) - || isType >(ddtAlpha()) + isType>(ddtAlpha()) + || isType>(ddtAlpha()) ) { ocCoeff = 0; } - else if (isType >(ddtAlpha())) + else if (isType>(ddtAlpha())) { if (nAlphaSubCycles > 1) { @@ -32,7 +32,7 @@ } ocCoeff = - refCast >(ddtAlpha()).ocCoeff(); + refCast>(ddtAlpha()).ocCoeff(); } else { diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H index 172676b97f..9cc90a9ebe 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H @@ -4,7 +4,7 @@ surfaceScalarField phir("phir", phic*interface.nHatf()); - Pair > vDotAlphal = + Pair> vDotAlphal = mixture->vDotAlphal(); const volScalarField& vDotcAlphal = vDotAlphal[0](); const volScalarField& vDotvAlphal = vDotAlphal[1](); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H index b759081eea..a1b9241fa5 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/pEqn.H @@ -39,7 +39,7 @@ )/(mesh.magSf().boundaryField()*rAUf.boundaryField()) ); - Pair > vDotP = mixture->vDotP(); + Pair> vDotP = mixture->vDotP(); const volScalarField& vDotcP = vDotP[0](); const volScalarField& vDotvP = vDotP[1](); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H index 4a174eb980..497a6e3d64 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H @@ -33,7 +33,7 @@ )/(mesh.magSf().boundaryField()*rAUf.boundaryField()) ); - Pair > vDotP = mixture->vDotP(); + Pair> vDotP = mixture->vDotP(); const volScalarField& vDotcP = vDotP[0](); const volScalarField& vDotvP = vDotP[1](); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C index f7cc2eae21..a4663ba488 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,13 +63,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const { const volScalarField& p = alpha1_.db().lookupObject("p"); volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); - return Pair > + return Pair> ( mcCoeff_*sqr(limitedAlpha1) *max(p - pSat(), p0_)/max(p - pSat(), 0.01*pSat()), @@ -78,13 +78,13 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotAlphal() const ); } -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::Kunz::mDotP() const { const volScalarField& p = alpha1_.db().lookupObject("p"); volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); - return Pair > + return Pair> ( mcCoeff_*sqr(limitedAlpha1)*(1.0 - limitedAlpha1) *pos(p - pSat())/max(p - pSat(), 0.01*pSat()), diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H index 393357a7ff..0b1c155f45 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,11 +105,11 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const; + virtual Pair> mDotAlphal() const; //- Return the mass condensation and vaporisation rates as coefficients // to multiply (p - pSat) - virtual Pair > mDotP() const; + virtual Pair> mDotP() const; //- Correct the Kunz phaseChange model virtual void correct(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C index 72fdb7245e..cfe6b1b008 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,25 +63,25 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotAlphal() const { const volScalarField& p = alpha1_.db().lookupObject("p"); - return Pair > + return Pair> ( mcCoeff_*max(p - pSat(), p0_), mvCoeff_*min(p - pSat(), p0_) ); } -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::Merkle::mDotP() const { const volScalarField& p = alpha1_.db().lookupObject("p"); volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); - return Pair > + return Pair> ( mcCoeff_*(1.0 - limitedAlpha1)*pos(p - pSat()), (-mvCoeff_)*limitedAlpha1*neg(p - pSat()) diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H index 0152b2d18a..1de1263e5c 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,11 +99,11 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const; + virtual Pair> mDotAlphal() const; //- Return the mass condensation and vaporisation rates as coefficients // to multiply (p - pSat) - virtual Pair > mDotP() const; + virtual Pair> mDotP() const; //- Correct the Merkle phaseChange model virtual void correct(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C index 189c7bae06..3be86e0f51 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::pCoeff } -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const { const volScalarField& p = alpha1_.db().lookupObject("p"); @@ -116,7 +116,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); - return Pair > + return Pair> ( Cc_*limitedAlpha1*pCoeff*max(p - pSat(), p0_), @@ -125,7 +125,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotAlphal() const } -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const { const volScalarField& p = alpha1_.db().lookupObject("p"); @@ -134,7 +134,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::mDotP() const volScalarField limitedAlpha1(min(max(alpha1_, scalar(0)), scalar(1))); volScalarField apCoeff(limitedAlpha1*pCoeff); - return Pair > + return Pair> ( Cc_*(1.0 - limitedAlpha1)*pos(p - pSat())*apCoeff, diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H index 67eb0dd5ba..c3b8f86a46 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,11 +112,11 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const; + virtual Pair> mDotAlphal() const; //- Return the mass condensation and vaporisation rates as coefficients // to multiply (p - pSat) - virtual Pair > mDotP() const; + virtual Pair> mDotP() const; //- Correct the SchnerrSauer phaseChange model virtual void correct(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C index 5575253888..b9a5e69bf8 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,26 +50,26 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixture::vDotAlphal() const { volScalarField alphalCoeff(1.0/rho1() - alpha1_*(1.0/rho1() - 1.0/rho2())); - Pair > mDotAlphal = this->mDotAlphal(); + Pair> mDotAlphal = this->mDotAlphal(); - return Pair > + return Pair> ( alphalCoeff*mDotAlphal[0], alphalCoeff*mDotAlphal[1] ); } -Foam::Pair > +Foam::Pair> Foam::phaseChangeTwoPhaseMixture::vDotP() const { dimensionedScalar pCoeff(1.0/rho1() - 1.0/rho2()); - Pair > mDotP = this->mDotP(); + Pair> mDotP = this->mDotP(); - return Pair >(pCoeff*mDotP[0], pCoeff*mDotP[1]); + return Pair>(pCoeff*mDotP[0], pCoeff*mDotP[1]); } diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H index 227768ac8d..dedc97a9e9 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -134,20 +134,20 @@ public: //- Return the mass condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - virtual Pair > mDotAlphal() const = 0; + virtual Pair> mDotAlphal() const = 0; //- Return the mass condensation and vaporisation rates as coefficients // to multiply (p - pSat) - virtual Pair > mDotP() const = 0; + virtual Pair> mDotP() const = 0; //- Return the volumetric condensation and vaporisation rates as a // coefficient to multiply (1 - alphal) for the condensation rate // and a coefficient to multiply alphal for the vaporisation rate - Pair > vDotAlphal() const; + Pair> vDotAlphal() const; //- Return the volumetric condensation and vaporisation rates as // coefficients to multiply (p - pSat) - Pair > vDotP() const; + Pair> vDotP() const; //- Correct the phaseChange model virtual void correct() = 0; diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H index 4c2c4ad3de..e10e3bb68b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,10 +150,10 @@ public: // Instantiation for multi-component-multi-component pairs #define makeInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ \ - typedef Thermo > > \ + typedef Thermo>> \ Type##Thermo##Comp##Mix##Phys; \ \ - typedef OtherThermo > \ + typedef OtherThermo> \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ \ addInterfaceCompositionToRunTimeSelectionTable \ @@ -166,10 +166,10 @@ public: // Instantiation for multi-component-single-component pairs #define makeSpecieInterfaceCompositionType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ \ - typedef Thermo > > \ + typedef Thermo>> \ Type##Thermo##Comp##Mix##Phys; \ \ - typedef OtherThermo > > \ + typedef OtherThermo>> \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ \ addInterfaceCompositionToRunTimeSelectionTable \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C index e8f16ee9ae..0cc976c042 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ void Foam::interfaceCompositionModels::Raoult::update forAllIter ( - HashTable >, + HashTable>, speciesModels_, iter ) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H index 103c8d048c..ca001df8e4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ private: volScalarField YNonVapourPrime_; //- Species' individual composition models - HashTable > speciesModels_; + HashTable> speciesModels_; public: diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C index 36e31630a4..64d2e63ae8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -353,7 +353,7 @@ Foam::BlendedInterfacialModel::Kf() const template template -Foam::tmp > +Foam::tmp> Foam::BlendedInterfacialModel::F() const { tmp f1, f2; @@ -368,7 +368,7 @@ Foam::BlendedInterfacialModel::F() const f2 = blending_.f2(phase1_, phase2_); } - tmp > x + tmp> x ( new GeometricField ( diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H index 4be8f0b347..c51599d58c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,7 @@ public: //- Return the blended force template - tmp > F() const; + tmp> F() const; //- Return the face blended force tmp Ff() const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H index 3a0cbd4ba2..c02f04e82e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ protected: < HashTable < - autoPtr > + autoPtr> >, phasePairKey, phasePairKey::hash @@ -77,7 +77,7 @@ protected: < HashTable < - autoPtr > + autoPtr> >, phasePairKey, phasePairKey::hash diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H index 0c908239fd..931fc2a758 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ protected: typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > heatTransferModelTable; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C index f50bd61f9e..c789d365b7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -543,10 +543,10 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem::setF template -Foam::autoPtr > +Foam::autoPtr> Foam::MomentumTransferPhaseSystem::Fs() const { - autoPtr > tFs + autoPtr> tFs ( new PtrList(this->phases().size()) ); @@ -628,13 +628,13 @@ Foam::MomentumTransferPhaseSystem::setPhiD template -Foam::autoPtr > +Foam::autoPtr> Foam::MomentumTransferPhaseSystem::phiDs ( const PtrList& rAUs ) const { - autoPtr > tphiDs + autoPtr> tphiDs ( new PtrList(this->phases().size()) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H index 2f787ed004..c449e0f67d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,35 +72,35 @@ protected: typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > dragModelTable; typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > virtualMassModelTable; typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > liftModelTable; typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > wallLubricationModelTable; typedef HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash > turbulentDispersionModelTable; @@ -187,10 +187,10 @@ public: virtual tmp F(const phasePairKey& key) const; //- Return the combined force (lift + wall-lubrication) - virtual autoPtr > Fs() const; + virtual autoPtr> Fs() const; //- Return the turbulent dispersion force on faces for phase pair - virtual autoPtr > phiDs + virtual autoPtr> phiDs ( const PtrList& rAUs ) const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H index 862f75646e..d869907a33 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ Description namespace Foam { - typedef ThermalDiffusivity > + typedef ThermalDiffusivity> phaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H index 9600f6ef9b..417c6cea6d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ namespace Foam template class ThermalDiffusivity; - typedef ThermalDiffusivity > + typedef ThermalDiffusivity> phaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H index 664add034f..cee72cb353 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -236,7 +236,7 @@ protected: const word& modelName, HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash >& models @@ -249,7 +249,7 @@ protected: const word& modelName, HashTable < - HashTable >, + HashTable>, phasePairKey, phasePairKey::hash >& models diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C index eee3fcd3b3..3ac0019fab 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ void Foam::phaseSystem::generatePairsAndSubModels const word& modelName, HashTable < - autoPtr >, + autoPtr>, phasePairKey, phasePairKey::hash >& models @@ -118,7 +118,7 @@ void Foam::phaseSystem::generatePairsAndSubModels models.insert ( key, - autoPtr > + autoPtr> ( new BlendedInterfacialModel ( @@ -141,7 +141,7 @@ void Foam::phaseSystem::generatePairsAndSubModels const word& modelName, HashTable < - HashTable >, + HashTable>, phasePairKey, phasePairKey::hash >& models @@ -169,7 +169,7 @@ void Foam::phaseSystem::generatePairsAndSubModels models.insert ( key, - HashTable >() + HashTable>() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index e33bf8c487..bf6d3e0d2e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -167,10 +167,10 @@ public: virtual tmp Kd(const phaseModel& phase) const = 0; //- Return the combined force (lift + wall-lubrication) for phase pair - virtual autoPtr > Fs() const = 0; + virtual autoPtr> Fs() const = 0; //- Return the turbulent dispersion force on faces for phase pair - virtual autoPtr > phiDs + virtual autoPtr> phiDs ( const PtrList& rAUs ) const = 0; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H index 2703d75ef1..8b4a27f2b8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H @@ -37,7 +37,7 @@ forAll(phases, phasei) // Lift, wall-lubrication and turbulent diffusion fluxes PtrList phiFs(phases.size()); { - autoPtr > Fs = fluid.Fs(); + autoPtr> Fs = fluid.Fs(); forAll(phases, phasei) { @@ -58,7 +58,7 @@ PtrList phiFs(phases.size()); } } { - autoPtr > phiDs = fluid.phiDs(rAUs); + autoPtr> phiDs = fluid.phiDs(rAUs); forAll(phases, phasei) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index e44534e398..43ad071962 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel : eddyViscosity < - RASModel > + RASModel> > ( type, @@ -187,7 +187,7 @@ bool Foam::RASModels::kineticTheoryModel::read() ( eddyViscosity < - RASModel > + RASModel> >::read() ) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index e18d41fb40..d648de7bc1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ class kineticTheoryModel : public eddyViscosity < - RASModel > + RASModel> > { // Private data diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 79df9e4922..c4ce9a7583 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,7 +42,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel : eddyViscosity < - RASModel > + RASModel> > ( type, @@ -90,7 +90,7 @@ bool Foam::RASModels::phasePressureModel::read() ( eddyViscosity < - RASModel > + RASModel> >::read() ) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index c7e9842f37..ab5e38effe 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,7 @@ class phasePressureModel : public eddyViscosity < - RASModel > + RASModel> > { // Private data diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 99879c41d5..f07624c001 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel RASModel - > > > + >>> > ( type, @@ -192,7 +192,7 @@ bool Foam::RASModels::kineticTheoryModel::read() RASModel - > > > + >>> >::read() ) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 9aadb83d12..91f58d3449 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ class kineticTheoryModel RASModel - > > > + >>> > { // Private data diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 2eba4bdab7..47364ab10d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel RASModel - > > > + >>> > ( type, @@ -96,7 +96,7 @@ bool Foam::RASModels::phasePressureModel::read() RASModel - > > > + >>> >::read() ) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 68734e5b4f..c148e3c40a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ class phasePressureModel RASModel - > > > + >>> > { // Private data diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index 090ffd1bcc..1cac6d7176 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -251,7 +251,7 @@ Foam::BlendedInterfacialModel::Kf() const template template -Foam::tmp > +Foam::tmp> Foam::BlendedInterfacialModel::F() const { tmp f1, f2; @@ -266,7 +266,7 @@ Foam::BlendedInterfacialModel::F() const f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed()); } - tmp > x + tmp> x ( new GeometricField ( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H index e6493fa1cf..c53894f45c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ public: //- Return the blended force template - tmp > F() const; + tmp> F() const; //- Return the face blended force tmp Ff() const; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H index 3f91a8bd25..5fb0245513 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ class phaseModel autoPtr dPtr_; //- Turbulence model - autoPtr > turbulence_; + autoPtr> turbulence_; public: diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H index 18928c7cc7..2355c0bf74 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,23 +97,23 @@ class twoPhaseSystem HashTable, word, word::hash> blendingMethods_; //- Drag model - autoPtr > drag_; + autoPtr> drag_; //- Virtual mass model - autoPtr > virtualMass_; + autoPtr> virtualMass_; //- Heat transfer model - autoPtr > heatTransfer_; + autoPtr> heatTransfer_; //- Lift model - autoPtr > lift_; + autoPtr> lift_; //- Wall lubrication model - autoPtr > + autoPtr> wallLubrication_; //- Wall lubrication model - autoPtr > + autoPtr> turbulentDispersion_; diff --git a/applications/test/CompactListList/Test-CompactListList.C b/applications/test/CompactListList/Test-CompactListList.C index 13a73cde7b..6d0a26676a 100644 --- a/applications/test/CompactListList/Test-CompactListList.C +++ b/applications/test/CompactListList/Test-CompactListList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) } } - List > lll(5); + List> lll(5); lll[0].setSize(3, 0); lll[1].setSize(2, 1); lll[2].setSize(6, 2); @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) cll2(2, 3) = 999; Info<< "cll2(2, 3) = " << cll2(2, 3) << nl << endl; - Info<< "cll2 as List > " << cll2() + Info<< "cll2 as List> " << cll2() << endl; cll2.setSize(3); diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C index 63f995d9a0..7b73a214c9 100644 --- a/applications/test/DynamicList/Test-DynamicList.C +++ b/applications/test/DynamicList/Test-DynamicList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ void printInfo int main(int argc, char *argv[]) { - List > ldl(2); + List> ldl(2); ldl[0](0) = 0; ldl[0](2) = 2; @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) } Info<< endl; - List > ll(2); + List> ll(2); ll[0].transfer(ldl[0]); ll[1].transfer(ldl[1].shrink()); diff --git a/applications/test/HashTable2/Test-HashTable2.C b/applications/test/HashTable2/Test-HashTable2.C index 79ff10de4c..0fb7b3a942 100644 --- a/applications/test/HashTable2/Test-HashTable2.C +++ b/applications/test/HashTable2/Test-HashTable2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) Info<< "table1: " << table1 << nl << "toc: " << table1.toc() << endl; - HashTable > table2(10); + HashTable> table2(10); table2.insert(3, 10); table2.insert(5, 12); diff --git a/applications/test/HashTable3/Test-HashTable3.C b/applications/test/HashTable3/Test-HashTable3.C index 82e6ce3b9f..7184d30574 100644 --- a/applications/test/HashTable3/Test-HashTable3.C +++ b/applications/test/HashTable3/Test-HashTable3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,9 +48,9 @@ int main(int argc, char *argv[]) // ie, a // Map