From b9940cbbb17ca720852cef0198098c7271dd5dee Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Fri, 23 Sep 2016 15:36:53 +0100 Subject: [PATCH] COMP: Multiple changes - first clean build after latest merge - UNTESTED --- .../basic/potentialFoam/potentialFoam.C | 6 +- .../combustion/XiFoam/XiDyMFoam/XiDyMFoam.C | 15 +- .../XiFoam/XiDyMFoam/readControls.H | 9 +- .../buoyantPimpleFoam/createFields.H | 2 - .../heatTransfer/buoyantPimpleFoam/pEqn.H | 4 +- .../heatTransfer/thermoFoam/setAlphaEff.H | 2 +- .../lagrangian/simpleCoalParcelFoam/EEqn.H | 33 + .../simpleCoalParcelFoam/Make/options | 3 +- .../lagrangian/simpleCoalParcelFoam/UEqn.H | 21 + .../lagrangian/simpleCoalParcelFoam/YEqn.H | 48 + .../simpleCoalParcelFoam/createFieldRefs.H | 3 + .../simpleCoalParcelFoam/createFields.H | 122 +++ .../lagrangian/simpleCoalParcelFoam/pEqn.H | 57 ++ .../simpleCoalParcelFoam.C | 27 +- ...pressibleTwoPhaseMixtureTurbulenceModels.C | 9 + .../MPPICInterFoam/MPPICInterFoam.C | 20 +- .../multiphase/MPPICInterFoam/Make/options | 1 + .../multiphase/MPPICInterFoam/alphaEqn.H | 3 +- .../multiphase/MPPICInterFoam/createFields.H | 2 + .../twoPhaseMixtureEThermo.C | 62 +- .../Make/options | 2 +- .../mesh/advanced/snappyRefineMesh/Make/files | 4 +- .../generation/snappyHexMesh/snappyHexMesh.C | 4 +- .../manipulation/checkMesh/checkTopology.C | 2 +- .../mesh/manipulation/subsetMesh/subsetMesh.C | 2 +- .../miscellaneous/foamDebugSwitches/Allwmake | 11 - .../decomposePar/decomposePar.C | 4 - .../decomposePar/domainDecomposition.C | 2 +- ...parFvFieldReconstructorReconstructFields.C | 18 +- .../redistributePar/redistributePar.C | 11 +- .../foamToEnsight/ensightField.C | 9 +- .../foamToEnsight/ensightField.H | 4 +- .../foamToEnsight/foamToEnsight.C | 54 +- .../dataConversion/foamToVTK/foamToVTK.C | 12 +- .../foamToVTK/foamToVTK/internalWriter.H | 4 +- .../foamToVTK/internalWriterTemplates.C | 4 +- .../foamToVTK/foamToVTK/writeFunsTemplates.C | 8 +- .../steadyParticleTracksTemplates.C | 6 +- .../applyBoundaryLayer/applyBoundaryLayer.C | 11 +- .../applyBoundaryLayer/createFields.H | 2 +- .../Make/options | 4 +- .../createExternalCoupledPatchGeometry.C | 6 +- .../viewFactorsGen/viewFactorsGen.C | 4 +- .../surface/surfaceCheck/surfaceCheck.C | 10 +- doc/Doxygen/Doxyfile | 11 +- doc/Doxygen/footer.html | 26 +- doc/Doxygen/header.html | 2 +- src/Allwmake | 4 - src/OpenFOAM/db/Time/Time.C | 2 - src/OpenFOAM/db/error/messageStream.H | 22 +- .../IOOutputFilter/IOOutputFilter.C | 147 --- .../IOOutputFilter/IOOutputFilter.H | 153 ---- .../functionObjectList/functionObjectList.C | 43 +- .../db/functionObjects/logFiles/logFiles.C | 21 +- .../db/functionObjects/logFiles/logFiles.H | 16 +- .../regionFunctionObject.C | 6 +- .../regionFunctionObject.H | 15 +- .../regionFunctionObjectTemplates.C | 19 +- .../stateFunctionObject.C} | 73 +- .../stateFunctionObject.H} | 65 +- .../stateFunctionObjectTemplates.C} | 54 +- .../functionObjects/timeControl/timeControl.H | 1 + .../db/functionObjects/writeFile/writeFile.C | 4 +- .../db/functionObjects/writeFile/writeFile.H | 13 +- src/OpenFOAM/fields/ReadFields/ReadFields.C | 145 --- .../fields/ReadFields/ReadFieldsTemplates.C | 145 +++ .../mapDistribute/mapDistributeTemplates.C | 2 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 4 +- src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C | 3 +- .../polyPatches/polyPatch/polyPatch.C | 4 +- .../CompressibleTurbulenceModel.H | 2 +- ...allHeatFluxTemperatureFvPatchScalarField.C | 8 +- ...allHeatFluxTemperatureFvPatchScalarField.H | 4 +- ...fixedIncidentRadiationFvPatchScalarField.C | 13 +- .../temperatureCoupledBase.C | 2 +- .../turbulentFluidThermoModels.C | 3 - .../turbulentTransportModels.C | 3 - .../Base/kOmegaSST/kOmegaSSTBase.C | 26 +- .../Base/kOmegaSST/kOmegaSSTBase.H | 20 +- .../SpalartAllmarasIDDES.C | 4 +- .../DES/kOmegaSSTDDES/kOmegaSSTDDES.C | 4 +- .../DES/kOmegaSSTDES/kOmegaSSTDES.C | 4 +- .../DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C | 2 +- .../LES/kOmegaSSTDES/kOmegaSSTDES.C | 156 ---- .../LES/kOmegaSSTDES/kOmegaSSTDES.H | 174 ---- .../linearViscousStress/linearViscousStress.H | 2 +- .../diffusionMulticomponent.C | 72 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 118 +-- .../fvMeshDistribute/fvMeshDistribute.C | 65 +- .../velocityDisplacementMotionSolver.C | 15 +- .../polyTopoChange/addPatchCellLayer.C | 188 ++-- .../hexRef8/refinementHistory.C | 7 - .../hexRef8/refinementHistory.H | 6 +- .../polyTopoChange/polyTopoChange.C | 4 +- .../turbulentDFSEMInletFvPatchVectorField.C | 24 +- ...entDFSEMInletFvPatchVectorFieldTemplates.C | 28 +- .../fvMeshFunctionObject.H | 4 +- .../functionObjects/volRegion/volRegion.C | 4 +- .../functionObjects/volRegion/volRegion.H | 16 +- .../field/CourantNo/CourantNo.H | 6 +- .../field/DESModelRegions/DESModelRegions.C | 178 ++++ .../field}/DESModelRegions/DESModelRegions.H | 84 +- src/functionObjects/field/Make/files | 13 +- src/functionObjects/field/PecletNo/PecletNo.C | 64 +- src/functionObjects/field/PecletNo/PecletNo.H | 26 +- .../field/blendingFactor/blendingFactor.C | 37 +- .../field/blendingFactor/blendingFactor.H | 29 +- .../blendingFactor/blendingFactorTemplates.C | 27 +- .../field/externalCoupled/externalCoupled.C} | 164 ++-- .../field/externalCoupled/externalCoupled.H} | 79 +- .../externalCoupledMixedFvPatchField.C | 0 .../externalCoupledMixedFvPatchField.H | 0 .../externalCoupledMixedFvPatchFields.C | 0 .../externalCoupledMixedFvPatchFields.H | 0 .../externalCoupledMixedFvPatchFieldsFwd.H | 0 ...oupledTemperatureMixedFvPatchScalarField.C | 2 +- ...oupledTemperatureMixedFvPatchScalarField.H | 0 .../externalCoupledTemplates.C} | 29 +- .../field/fieldAverage/fieldAverage.C | 4 +- .../fieldAverageItem/fieldAverageItem.C | 3 + .../fieldAverageItem/fieldAverageItem.H | 34 +- .../fieldAverageItem/fieldAverageItemIO.C | 10 +- .../fieldAverage/fieldAverageTemplates.C | 3 + .../fieldCoordinateSystemTransformTemplates.C | 29 +- .../field/fieldMinMax/fieldMinMax.C | 7 +- .../field/fieldMinMax/fieldMinMax.H | 6 +- .../field/fieldMinMax/fieldMinMaxTemplates.C | 56 +- .../field/fieldValues/fieldValue/fieldValue.C | 1 + .../field/fieldValues/fieldValue/fieldValue.H | 8 +- .../fieldValueDelta/fieldValueDelta.C | 17 +- .../fieldValueDelta/fieldValueDelta.H | 65 +- .../fieldValueDeltaTemplates.C | 2 +- .../surfaceFieldValue/surfaceFieldValue.C | 10 +- .../surfaceFieldValue/surfaceFieldValue.H | 56 +- .../surfaceFieldValue/surfaceFieldValueI.H | 3 +- .../surfaceFieldValueTemplates.C | 8 +- .../fieldValues/volFieldValue/volFieldValue.C | 2 +- .../fieldValues/volFieldValue/volFieldValue.H | 2 +- .../volFieldValue/volFieldValueTemplates.C | 9 +- .../field}/fluxSummary/fluxSummary.C | 256 +++--- .../field}/fluxSummary/fluxSummary.H | 100 +-- .../field/histogram/histogram.C | 22 +- .../field/histogram/histogram.H | 5 +- .../field}/mapFields/mapFields.C | 124 ++- .../field}/mapFields/mapFields.H | 86 +- .../field}/mapFields/mapFieldsTemplates.C | 30 +- src/functionObjects/field/pressure/pressure.C | 2 +- src/functionObjects/field/pressure/pressure.H | 6 +- .../reactionsSensitivityAnalysis.C | 87 +- .../reactionsSensitivityAnalysis.H | 80 +- .../reactionsSensitivityAnalysisObjects.C} | 40 +- .../field/readFields/readFields.C | 10 +- .../field/readFields/readFields.H | 5 +- .../field/readFields/readFieldsTemplates.C | 26 +- .../regionSizeDistribution.C | 23 +- .../regionSizeDistribution.H | 5 +- .../field/streamFunction/streamFunction.C | 9 +- .../field/streamLine/streamLine.C | 567 +----------- .../field/streamLine/streamLineBase.C | 842 ++++++++---------- .../field/streamLine/streamLineBase.H | 48 +- .../surfaceInterpolate/surfaceInterpolate.H | 2 +- .../surfaceInterpolateTemplates.C | 11 +- .../field/turbulenceFields/turbulenceFields.C | 17 +- .../field/turbulenceFields/turbulenceFields.H | 7 +- .../field/valueAverage/valueAverage.C | 118 +-- .../field/valueAverage/valueAverage.H | 82 +- .../valueAverage/valueAverageTemplates.C | 6 +- .../wallBoundedStreamLine.C | 101 +-- .../field/wallHeatFlux/wallHeatFlux.C | 67 +- .../field/wallHeatFlux/wallHeatFlux.H | 14 +- .../field/wallShearStress/wallShearStress.C | 11 +- src/functionObjects/field/yPlus/yPlus.C | 72 +- src/functionObjects/field/yPlus/yPlus.H | 22 +- .../field/yPlus/yPlusTemplates.C | 80 -- .../forces/forceCoeffs/forceCoeffs.C | 32 +- src/functionObjects/forces/forces/forces.C | 132 +-- src/functionObjects/forces/forces/forces.H | 6 +- .../IOrunTimePostProcessing.H | 49 - .../fieldVisualisationBase.C | 48 +- .../fieldVisualisationBase.H | 10 +- .../functionObjectCloud.C | 26 +- .../functionObjectCloud.H | 23 +- .../functionObjectLine.C | 18 +- .../functionObjectLine.H | 21 +- .../functionObjectSurface.C | 17 +- .../functionObjectSurface.H | 25 +- .../runTimePostProcessing/geometryBase.C | 40 +- .../runTimePostProcessing/geometryBase.H | 24 +- .../runTimePostProcessing/geometrySurface.C | 24 +- .../runTimePostProcessing/geometrySurface.H | 19 +- .../graphics/runTimePostProcessing/pathline.C | 45 +- .../graphics/runTimePostProcessing/pathline.H | 16 +- .../runTimePostProcessing/pointData.C | 41 +- .../runTimePostProcessing/pointData.H | 22 +- .../runTimePostProcessing.C | 67 +- .../runTimePostProcessing.H | 79 +- .../runTimePostProcessingFunctionObject.C | 42 - .../runTimePostProcessingFunctionObject.H | 54 -- .../runTimePostProcessingTemplates.C | 2 +- .../graphics/runTimePostProcessing/scene.C | 59 +- .../graphics/runTimePostProcessing/scene.H | 12 +- .../graphics/runTimePostProcessing/surface.C | 58 +- .../graphics/runTimePostProcessing/surface.H | 18 +- .../graphics/runTimePostProcessing/text.C | 17 +- .../graphics/runTimePostProcessing/text.H | 18 +- .../lagrangian/cloudInfo/cloudInfo.C | 6 +- .../solvers/scalarTransport/scalarTransport.C | 50 +- .../solvers/scalarTransport/scalarTransport.H | 8 +- src/functionObjects/utilities/Make/files | 27 +- .../removeRegisteredObject.C | 17 +- .../removeRegisteredObject.H | 9 +- .../utilities/residuals/residuals.C | 2 +- .../utilities/residuals/residualsTemplates.C | 2 +- .../averageCondition/averageCondition.C | 18 +- .../averageCondition/averageCondition.H | 12 +- .../averageConditionTemplates.C | 4 +- .../equationInitialResidualCondition.C | 60 +- .../equationInitialResidualCondition.H | 20 +- .../equationMaxIterCondition.C | 20 +- .../equationMaxIterCondition.H | 17 +- .../minMaxCondition/minMaxCondition.C | 31 +- .../minMaxCondition/minMaxCondition.H | 16 +- .../minMaxConditionTemplates.C | 4 +- .../minTimeStepCondition.C | 18 +- .../minTimeStepCondition.H | 20 +- .../runTimeCondition/runTimeCondition.C | 32 +- .../runTimeCondition/runTimeCondition.H | 24 +- .../runTimeCondition/runTimeConditionNew.C | 5 +- .../runTimeControl/runTimeControl.C | 162 ++-- .../runTimeControl/runTimeControl.H | 58 +- .../timeActivatedFileUpdate.C | 2 +- .../writeDictionary/writeDictionary.C | 13 +- .../writeDictionary/writeDictionary.H | 9 +- .../surfaceAlignedSBRStressFvMotionSolver.C | 78 +- .../surfaceAlignedSBRStressFvMotionSolver.H | 2 +- .../patchCorrectedInterpolationTemplates.C | 44 +- src/fvOptions/Make/files | 7 +- .../fixedTemperatureConstraint.C | 0 .../fixedTemperatureConstraint.H | 0 .../FixedValueConstraint.C | 0 .../FixedValueConstraint.H | 0 .../fixedValueConstraints.C | 0 .../acousticDampingSource.C | 2 +- .../tabulatedNTUHeatTransfer.C | 4 +- .../KinematicParcel/KinematicParcel.C | 2 +- .../PatchInjection/patchInjectionBase.C | 4 +- .../PatchInteractionModel.C | 6 +- .../shellSurfaces/shellSurfaces.C | 2 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 10 +- .../snappyHexMeshDriver/snappySnapDriver.C | 5 +- .../AMIInterpolation/AMIInterpolation.C | 18 +- .../algorithms/MeshWave/FaceCellWave.C | 334 ++++--- .../algorithms/MeshWave/FaceCellWave.H | 2 +- .../indexedOctree/treeDataPrimitivePatch.C | 4 +- .../searchableSurface/triSurfaceMesh.C | 2 +- .../intersectedSurface/intersectedSurface.C | 12 +- .../field/valueAverage/IOvalueAverage.H | 49 - .../valueAverage/valueAverageFunctionObject.C | 42 - .../valueAverage/valueAverageFunctionObject.H | 54 -- .../runTimeControl/IOrunTimeControl.H | 49 - .../runTimeControlFunctionObject.C | 42 - .../runTimeControlFunctionObject.H | 54 -- .../DESModelRegions/DESModelRegions.C | 206 ----- .../DESModelRegionsFunctionObject.C | 42 - .../DESModelRegionsFunctionObject.H | 54 -- .../DESModelRegions/IODESModelRegions.H | 49 - .../utilities/fluxSummary/IOfluxSummary.H | 49 - .../fluxSummary/fluxSummaryFunctionObject.C | 42 - .../fluxSummary/fluxSummaryFunctionObject.H | 53 -- .../utilities/mapFields/IOmapFields.H | 49 - .../mapFields/mapFieldsFunctionObject.C | 42 - .../mapFields/mapFieldsFunctionObject.H | 53 -- ...actionsSensitivityAnalysisFunctionObject.H | 64 -- .../regionModel/regionModel1D/regionModel1D.C | 26 +- ...linedFilmNusseltHeightFvPatchScalarField.C | 2 +- ...lmNusseltInletVelocityFvPatchVectorField.C | 13 +- src/renumber/renumberMethods/Make/options | 1 - src/sampling/meshToMesh/meshToMesh.C | 24 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 31 +- src/sampling/probes/IOprobes.H | 51 -- src/sampling/probes/patchProbes.C | 48 +- src/sampling/probes/patchProbes.H | 11 +- src/sampling/probes/patchProbesTemplates.C | 12 +- src/sampling/probes/probes.C | 32 +- src/sampling/probes/probes.H | 13 +- src/sampling/probes/probesGrouping.C | 5 +- .../sampledSet/sampledSets/IOsampledSets.H | 49 - .../sampledSet/sampledSets/sampledSets.C | 17 +- .../sampledSet/sampledSets/sampledSets.H | 2 +- .../sampledSurface/isoSurface/isoSurface.C | 4 +- .../sampledSurface/isoSurface/isoSurface.H | 2 +- .../sampledSurfaces/IOsampledSurfaces.H | 49 - .../sampledSurfaces/sampledSurfaces.C | 12 +- .../sampledSurfaces/sampledSurfaces.H | 5 +- .../boundaryDataSurfaceWriterTemplates.C | 30 +- .../writers/foam/foamSurfaceWriter.C | 51 +- .../writers/foam/foamSurfaceWriter.H | 4 +- .../foamSurfaceWriterTemplates.C} | 4 +- .../TDACChemistryModel/TDACChemistryModel.C | 4 +- .../basicChemistryModel/basicChemistryModel.H | 5 +- .../specieReactionRates/specieReactionRates.C | 50 +- .../specieReactionRates/specieReactionRates.H | 10 +- ...emperatureCoupledMixedFvPatchScalarField.C | 12 +- .../MarshakRadiationFvPatchScalarField.C | 4 +- ...iationFixedTemperatureFvPatchScalarField.C | 4 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 18 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 56 +- .../radiationModel/radiationModel.C | 14 +- .../solarLoad/faceShading/faceShading.C | 5 +- .../radiationModels/solarLoad/solarLoad.C | 23 +- .../radiationModels/viewFactor/viewFactor.C | 14 +- 311 files changed, 4119 insertions(+), 6540 deletions(-) create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/EEqn.H create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/UEqn.H create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H create mode 100644 applications/solvers/lagrangian/simpleCoalParcelFoam/pEqn.H delete mode 100755 applications/utilities/miscellaneous/foamDebugSwitches/Allwmake delete mode 100644 src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C delete mode 100644 src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H rename src/OpenFOAM/db/functionObjects/{functionObjectState/functionObjectState.C => stateFunctionObject/stateFunctionObject.C} (68%) rename src/OpenFOAM/db/functionObjects/{functionObjectState/functionObjectState.H => stateFunctionObject/stateFunctionObject.H} (85%) rename src/OpenFOAM/db/functionObjects/{functionObjectState/functionObjectStateTemplates.C => stateFunctionObject/stateFunctionObjectTemplates.C} (80%) delete mode 100644 src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C delete mode 100644 src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H create mode 100644 src/functionObjects/field/DESModelRegions/DESModelRegions.C rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/DESModelRegions/DESModelRegions.H (65%) rename src/{postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.C => functionObjects/field/externalCoupled/externalCoupled.C} (86%) rename src/{postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObject.H => functionObjects/field/externalCoupled/externalCoupled.H} (84%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C (100%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.H (100%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.C (100%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFields.H (100%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchFieldsFwd.H (100%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C (99%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/field}/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H (100%) rename src/{postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C => functionObjects/field/externalCoupled/externalCoupledTemplates.C} (95%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/fluxSummary/fluxSummary.C (80%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/fluxSummary/fluxSummary.H (75%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/mapFields/mapFields.C (67%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/mapFields/mapFields.H (70%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/mapFields/mapFieldsTemplates.C (82%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C (82%) rename src/{postProcessing/functionObjects/utilities => functionObjects/field}/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.H (70%) rename src/{postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.C => functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysisObjects.C} (80%) rename src/{postProcessing => }/functionObjects/field/valueAverage/valueAverage.C (62%) rename src/{postProcessing => }/functionObjects/field/valueAverage/valueAverage.H (71%) rename src/{postProcessing => }/functionObjects/field/valueAverage/valueAverageTemplates.C (91%) delete mode 100644 src/functionObjects/field/yPlus/yPlusTemplates.C delete mode 100644 src/functionObjects/graphics/runTimePostProcessing/IOrunTimePostProcessing.H delete mode 100644 src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.C delete mode 100644 src/functionObjects/graphics/runTimePostProcessing/runTimePostProcessingFunctionObject.H rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/averageCondition/averageCondition.C (91%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/averageCondition/averageCondition.H (92%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/averageCondition/averageConditionTemplates.C (94%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C (84%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H (84%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C (89%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.H (86%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C (86%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H (90%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/minMaxCondition/minMaxConditionTemplates.C (91%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.C (84%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H (82%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.C (74%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/runTimeCondition/runTimeCondition.H (88%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C (92%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeControl.C (64%) rename src/{postProcessing/functionObjects/jobControl => functionObjects/utilities}/runTimeControl/runTimeControl.H (73%) rename src/fvOptions/constraints/{ => derived}/fixedTemperatureConstraint/fixedTemperatureConstraint.C (100%) rename src/fvOptions/constraints/{ => derived}/fixedTemperatureConstraint/fixedTemperatureConstraint.H (100%) rename src/fvOptions/constraints/{ => general}/fixedValueConstraint/FixedValueConstraint.C (100%) rename src/fvOptions/constraints/{ => general}/fixedValueConstraint/FixedValueConstraint.H (100%) rename src/fvOptions/constraints/{ => general}/fixedValueConstraint/fixedValueConstraints.C (100%) delete mode 100644 src/postProcessing/functionObjects/field/valueAverage/IOvalueAverage.H delete mode 100644 src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.C delete mode 100644 src/postProcessing/functionObjects/field/valueAverage/valueAverageFunctionObject.H delete mode 100644 src/postProcessing/functionObjects/jobControl/runTimeControl/IOrunTimeControl.H delete mode 100644 src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.C delete mode 100644 src/postProcessing/functionObjects/jobControl/runTimeControl/runTimeControlFunctionObject.H delete mode 100644 src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C delete mode 100644 src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.C delete mode 100644 src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegionsFunctionObject.H delete mode 100644 src/postProcessing/functionObjects/utilities/DESModelRegions/IODESModelRegions.H delete mode 100644 src/postProcessing/functionObjects/utilities/fluxSummary/IOfluxSummary.H delete mode 100644 src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.C delete mode 100644 src/postProcessing/functionObjects/utilities/fluxSummary/fluxSummaryFunctionObject.H delete mode 100644 src/postProcessing/functionObjects/utilities/mapFields/IOmapFields.H delete mode 100644 src/postProcessing/functionObjects/utilities/mapFields/mapFieldsFunctionObject.C delete mode 100644 src/postProcessing/functionObjects/utilities/mapFields/mapFieldsFunctionObject.H delete mode 100644 src/postProcessing/functionObjects/utilities/reactionSensitivityAnalysis/reactionsSensitivityAnalysisFunctionObject.H delete mode 100644 src/sampling/probes/IOprobes.H delete mode 100644 src/sampling/sampledSet/sampledSets/IOsampledSets.H delete mode 100644 src/sampling/sampledSurface/sampledSurfaces/IOsampledSurfaces.H rename src/sampling/sampledSurface/writers/{foamFile/foamFileSurfaceWriterTemplates.C => foam/foamSurfaceWriterTemplates.C} (94%) diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 0dbe1b5cad..f0c04eadb4 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -28,9 +28,9 @@ Group grpBasicSolvers Description - Potential flow solver which solves for the velocity potential - from which the flux-field is obtained and velocity field by reconstructing - the flux. + Potential flow solver which solves for the velocity potential, to + calculate the flux-field, from which the velocity field is obtained by + reconstructing the flux. \heading Solver details The potential flow solution is typically employed to generate initial fields diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C index 0f6f2976f1..07b52d60d9 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -67,25 +67,26 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createDynamicFvMesh.H" - #include "initContinuityErrs.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "readCombustionProperties.H" #include "readGravitationalAcceleration.H" #include "createFields.H" - #include "createMRF.H" + #include "createFieldRefs.H" #include "createFvOptions.H" + #include "initContinuityErrs.H" #include "createRhoUf.H" #include "createControls.H" #include "initContinuityErrs.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + turbulence->validate(); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H index cf50980460..ed2db49fb4 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H @@ -1,7 +1,6 @@ - #include "readTimeControls.H" +#include "readTimeControls.H" - bool correctPhi = - pimple.dict().lookupOrDefault("correctPhi", true); +correctPhi = pimple.dict().lookupOrDefault("correctPhi", true); - bool checkMeshCourantNo = - pimple.dict().lookupOrDefault("checkMeshCourantNo", false); +checkMeshCourantNo = + pimple.dict().lookupOrDefault("checkMeshCourantNo", false); diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index 5e1644fc97..cc0bc64f0a 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -18,8 +18,6 @@ volScalarField rho ); volScalarField& p = thermo.p(); -const volScalarField& psi = thermo.psi(); - Info<< "Reading field U\n" << endl; volVectorField U diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H index c778ef40a8..15c87f9c85 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H @@ -41,8 +41,6 @@ p_rghDDtEqn = ( fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh)) - == - fvOptions(psi, p_rgh, rho.name()) ); } @@ -53,6 +51,8 @@ p_rghDDtEqn() + fvc::div(phiHbyA) - fvm::laplacian(rhorAUf, p_rgh) + == + fvOptions(psi, p_rgh, rho.name()) ); p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter()))); diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H index 73a157fc12..c760349a6e 100644 --- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H +++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H @@ -11,7 +11,7 @@ IOobject turbulencePropertiesHeader false ); -if (turbulencePropertiesHeader.headerOk()) +if (turbulencePropertiesHeader.typeHeaderOk(false)) { autoPtr turbulence ( diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/EEqn.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/EEqn.H new file mode 100644 index 0000000000..8239d44621 --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/EEqn.H @@ -0,0 +1,33 @@ +{ + volScalarField& he = thermo.he(); + + fvScalarMatrix EEqn + ( + mvConvection->fvmDiv(phi, he) + + ( + he.name() == "e" + ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho)) + : fvc::div(phi, volScalarField("K", 0.5*magSqr(U))) + ) + - fvm::laplacian(turbulence->alphaEff(), he) + == + rho*(U&g) + + parcels.Sh(he) + + radiation->Sh(thermo) + + combustion->Sh() + + fvOptions(rho, he) + ); + + EEqn.relax(); + + fvOptions.constrain(EEqn); + + EEqn.solve(); + + fvOptions.correct(he); + thermo.correct(); + radiation->correct(); + + Info<< "T gas min/max = " << min(T).value() << ", " + << max(T).value() << endl; +} diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options index efdf721ee3..d88ca09eae 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options @@ -24,8 +24,7 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/UEqn.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/UEqn.H new file mode 100644 index 0000000000..a29d4b8c57 --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/UEqn.H @@ -0,0 +1,21 @@ + MRF.correctBoundaryVelocity(U); + + tmp tUEqn + ( + fvm::div(phi, U) + + MRF.DDt(rho, U) + + turbulence->divDevRhoReff(U) + == + rho()*g + + parcels.SU(U) + + fvOptions(rho, U) + ); + fvVectorMatrix& UEqn = tUEqn.ref(); + + UEqn.relax(); + + fvOptions.constrain(UEqn); + + solve(UEqn == -fvc::grad(p)); + + fvOptions.correct(U); diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H new file mode 100644 index 0000000000..7c7cf9a4c0 --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H @@ -0,0 +1,48 @@ +tmp> mvConvection +( + fv::convectionScheme::New + ( + mesh, + fields, + phi, + mesh.divScheme("div(phi,Yi_h)") + ) +); + +{ + combustion->correct(); + dQ = combustion->dQ(); + volScalarField Yt(0.0*Y[0]); + + forAll(Y, i) + { + if (i != inertIndex && composition.active(i)) + { + volScalarField& Yi = Y[i]; + + fvScalarMatrix YEqn + ( + mvConvection->fvmDiv(phi, Yi) + - fvm::laplacian(turbulence->muEff(), Yi) + == + parcels.SYi(i, Yi) + + combustion->R(Yi) + + fvOptions(rho, Yi) + ); + + YEqn.relax(); + + fvOptions.constrain(YEqn); + + YEqn.solve(mesh.solver("Yi")); + + fvOptions.correct(Yi); + + Yi.max(0.0); + Yt += Yi; + } + } + + Y[inertIndex] = scalar(1) - Yt; + Y[inertIndex].max(0.0); +} diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H new file mode 100644 index 0000000000..fdc479bc23 --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFieldRefs.H @@ -0,0 +1,3 @@ +const volScalarField& psi = thermo.psi(); +const volScalarField& T = thermo.T(); +const label inertIndex(composition.species()[inertSpecie]); diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H new file mode 100644 index 0000000000..16f297c995 --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H @@ -0,0 +1,122 @@ +#include "readGravitationalAcceleration.H" + +Info<< "Creating combustion model\n" << endl; + +autoPtr combustion +( + combustionModels::rhoCombustionModel::New(mesh) +); + +rhoReactionThermo& thermo = combustion->thermo(); +thermo.validate(args.executable(), "h", "e"); + +SLGThermo slgThermo(mesh, thermo); + +basicSpecieMixture& composition = thermo.composition(); +PtrList& Y = composition.Y(); + +const word inertSpecie(thermo.lookup("inertSpecie")); +if (!composition.species().found(inertSpecie)) +{ + FatalIOErrorIn(args.executable().c_str(), thermo) + << "Inert specie " << inertSpecie << " not found in available species " + << composition.species() + << exit(FatalIOError); +} + +volScalarField& p = thermo.p(); + +volScalarField rho +( + IOobject + ( + "rho", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + thermo.rho() +); + +Info<< "\nReading field U\n" << endl; +volVectorField U +( + IOobject + ( + "U", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + mesh +); + +#include "compressibleCreatePhi.H" + +mesh.setFluxRequired(p.name()); + +dimensionedScalar rhoMax +( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + simple.dict(), + dimDensity, + GREAT + ) +); + +dimensionedScalar rhoMin +( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + simple.dict(), + dimDensity, + 0 + ) +); + +Info<< "Creating turbulence model\n" << endl; +autoPtr turbulence +( + compressible::turbulenceModel::New + ( + rho, + U, + phi, + thermo + ) +); + +// Set the turbulence into the combustion model +combustion->setTurbulence(turbulence()); + +Info<< "Creating multi-variate interpolation scheme\n" << endl; +multivariateSurfaceInterpolationScheme::fieldTable fields; + +forAll(Y, i) +{ + fields.add(Y[i]); +} +fields.add(thermo.he()); + +volScalarField dQ +( + IOobject + ( + "dQ", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + mesh, + dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) +); + +#include "createMRF.H" +#include "createRadiationModel.H" +#include "createClouds.H" diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/pEqn.H b/applications/solvers/lagrangian/simpleCoalParcelFoam/pEqn.H new file mode 100644 index 0000000000..055eff6f0b --- /dev/null +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/pEqn.H @@ -0,0 +1,57 @@ +{ + // Thermodynamic density needs to be updated by psi*d(p) after the + // pressure solution - done in 2 parts. Part 1: + thermo.rho() -= psi*p; + + volScalarField rAU(1.0/UEqn.A()); + surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); + volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); + tUEqn.clear(); + surfaceScalarField phiHbyA + ( + "phiHbyA", + fvc::interpolate(rho)*fvc::flux(HbyA) + ); + + MRF.makeRelative(fvc::interpolate(rho), phiHbyA); + + // Update the pressure BCs to ensure flux consistency + constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); + + while (simple.correctNonOrthogonal()) + { + fvScalarMatrix pEqn + ( + fvc::div(phiHbyA) + - fvm::laplacian(rhorAUf, p) + == + parcels.Srho() + + fvOptions(psi, p, rho.name()) + ); + + pEqn.solve(); + + if (simple.finalNonOrthogonalIter()) + { + phi = phiHbyA + pEqn.flux(); + } + } + + p.relax(); + + // Second part of thermodynamic density update + thermo.rho() += psi*p; + + #include "compressibleContinuityErrs.H" + + U = HbyA - rAU*fvc::grad(p); + U.correctBoundaryConditions(); + fvOptions.correct(U); + + rho = thermo.rho(); + rho = max(rho, rhoMin); + rho = min(rho, rhoMax); + rho.relax(); + + Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl; +} diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C index d9932d06dd..12ac28ccdf 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,13 +24,12 @@ License Application simpleReactingParcelFoam -Description - Steady state SIMPLE solver for laminar or turbulent flow with coal - Lagrangian parcels. +Group + grpLagrangianSolvers - Note: - - including run-time selectable finite volume options,e.g. sources, - constraints +Description + Steady state solver for compressible, turbulent flow with coal particle + clouds and optional sources/constraints. \*---------------------------------------------------------------------------*/ @@ -49,21 +48,19 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" - - simpleControl simple(mesh); - + #include "createControl.H" #include "createFields.H" - #include "createRadiationModel.H" - #include "createClouds.H" - #include "createMRF.H" + #include "createFieldRefs.H" #include "createFvOptions.H" #include "initContinuityErrs.H" + turbulence->validate(); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C index 193501ea42..86eabba39e 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C +++ b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C @@ -32,6 +32,15 @@ License #include "turbulentTransportModel.H" #include "LESModel.H" +makeTurbulenceModelTypes +( + volScalarField, + geometricOneField, + incompressibleTurbulenceModel, + PhaseCompressibleTurbulenceModel, + immiscibleIncompressibleTwoPhaseMixture +); + makeBaseTurbulenceModel ( volScalarField, diff --git a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C index 07a6b062bb..d2cab50bee 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C +++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C @@ -30,7 +30,7 @@ Description The momentum and other fluid properties are of the "mixture" and a single momentum equation is solved. - It includes MRF and MPPIC clouds + It includes MRF and an MPPIC cloud. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. @@ -53,26 +53,22 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "createTimeControls.H" + #include "createControl.H" #include "initContinuityErrs.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" + #include "createTimeControls.H" #include "correctPhi.H" - - turbulence->validate(); - - - #include "readTimeControls.H" #include "CourantNo.H" #include "setInitialDeltaT.H" + turbulence->validate(); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -126,7 +122,7 @@ int main(int argc, char *argv[]) zeroGradientFvPatchVectorField::typeName ); - cloudVolSUSu.internalField() = -cloudSU.source()/mesh.V(); + cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V(); cloudVolSUSu.correctBoundaryConditions(); cloudSU.source() = vector::zero; diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options index 8ecd0b4a1e..e298ad1f59 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options @@ -1,6 +1,7 @@ interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam EXE_INC = \ + -I. \ -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \ -I$(interFoamPath) \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H b/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H index a177326504..97d1428638 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H +++ b/applications/solvers/multiphase/MPPICInterFoam/alphaEqn.H @@ -17,9 +17,10 @@ // Do not compress interface at non-coupled boundary faces // (inlets, outlets etc.) + surfaceScalarField::Boundary& phicBf = phic.boundaryFieldRef(); forAll(phic.boundaryField(), patchi) { - fvsPatchScalarField& phicp = phic.boundaryField()[patchi]; + fvsPatchScalarField& phicp = phicBf[patchi]; if (!phicp.coupled()) { diff --git a/applications/solvers/multiphase/MPPICInterFoam/createFields.H b/applications/solvers/multiphase/MPPICInterFoam/createFields.H index a7d456f532..de8ae559cc 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H +++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H @@ -217,3 +217,5 @@ mixture ) ); + + #include "createMRF.H" diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C index a2c2b71fcf..e8ae64ce1d 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C @@ -42,7 +42,7 @@ namespace Foam void Foam::twoPhaseMixtureEThermo::eBoundaryCorrection(volScalarField& h) { - volScalarField::GeometricBoundaryField& hbf = h.boundaryField(); + volScalarField::Boundary& hbf = h.boundaryFieldRef(); forAll(hbf, patchi) { @@ -59,6 +59,7 @@ void Foam::twoPhaseMixtureEThermo::eBoundaryCorrection(volScalarField& h) } } + void Foam::twoPhaseMixtureEThermo::init() { const volScalarField alpha1Rho1(alpha1()*rho1()); @@ -74,6 +75,7 @@ void Foam::twoPhaseMixtureEThermo::init() e_.correctBoundaryConditions(); } + // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * // Foam::twoPhaseMixtureEThermo::twoPhaseMixtureEThermo @@ -117,11 +119,13 @@ Foam::twoPhaseMixtureEThermo::twoPhaseMixtureEThermo init(); } + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::twoPhaseMixtureEThermo::~twoPhaseMixtureEThermo() {} + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::twoPhaseMixtureEThermo::correct() @@ -226,10 +230,8 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::he } -Foam::tmp -Foam::twoPhaseMixtureEThermo::hc() const +Foam::tmp Foam::twoPhaseMixtureEThermo::hc() const { - const fvMesh& mesh = this->T_.mesh(); return tmp @@ -277,8 +279,7 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::THE } -Foam::tmp -Foam::twoPhaseMixtureEThermo::Cp() const +Foam::tmp Foam::twoPhaseMixtureEThermo::Cp() const { const volScalarField limitedAlpha1 ( @@ -317,8 +318,7 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::Cp } -Foam::tmp -Foam::twoPhaseMixtureEThermo::rho() const +Foam::tmp Foam::twoPhaseMixtureEThermo::rho() const { const volScalarField limitedAlpha1 ( @@ -337,8 +337,7 @@ Foam::twoPhaseMixtureEThermo::rho() const } -Foam::tmp -Foam::twoPhaseMixtureEThermo::rho +Foam::tmp Foam::twoPhaseMixtureEThermo::rho ( const label patchi ) const @@ -357,8 +356,7 @@ Foam::twoPhaseMixtureEThermo::rho } -Foam::tmp -Foam::twoPhaseMixtureEThermo::Cv() const +Foam::tmp Foam::twoPhaseMixtureEThermo::Cv() const { const volScalarField limitedAlpha1 ( @@ -376,8 +374,7 @@ Foam::twoPhaseMixtureEThermo::Cv() const } -Foam::tmp -Foam::twoPhaseMixtureEThermo::Cv +Foam::tmp Foam::twoPhaseMixtureEThermo::Cv ( const scalarField& p, const scalarField& T, @@ -398,8 +395,7 @@ Foam::twoPhaseMixtureEThermo::Cv } -Foam::tmp -Foam::twoPhaseMixtureEThermo::gamma() const +Foam::tmp Foam::twoPhaseMixtureEThermo::gamma() const { return tmp ( @@ -422,8 +418,7 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::gamma } -Foam::tmp -Foam::twoPhaseMixtureEThermo::Cpv() const +Foam::tmp Foam::twoPhaseMixtureEThermo::Cpv() const { // This is an e thermo (Cpv = Cv) return Cv(); @@ -442,16 +437,14 @@ Foam::tmp Foam::twoPhaseMixtureEThermo::Cpv } -Foam::tmp -Foam::twoPhaseMixtureEThermo::CpByCpv() const +Foam::tmp Foam::twoPhaseMixtureEThermo::CpByCpv() const { NotImplemented; return tmp(); } -Foam::tmp -Foam::twoPhaseMixtureEThermo::CpByCpv +Foam::tmp Foam::twoPhaseMixtureEThermo::CpByCpv ( const scalarField& p, const scalarField& T, @@ -463,8 +456,7 @@ Foam::twoPhaseMixtureEThermo::CpByCpv } -Foam::tmp -Foam::twoPhaseMixtureEThermo::kappa() const +Foam::tmp Foam::twoPhaseMixtureEThermo::kappa() const { const volScalarField limitedAlpha1 ( @@ -482,8 +474,10 @@ Foam::twoPhaseMixtureEThermo::kappa() const } -Foam::tmp -Foam::twoPhaseMixtureEThermo::kappa(const label patchi) const +Foam::tmp Foam::twoPhaseMixtureEThermo::kappa +( + const label patchi +) const { const volScalarField limitedAlpha1 ( @@ -496,8 +490,7 @@ Foam::twoPhaseMixtureEThermo::kappa(const label patchi) const } -Foam::tmp -Foam::twoPhaseMixtureEThermo::kappaEff +Foam::tmp Foam::twoPhaseMixtureEThermo::kappaEff ( const volScalarField& kappat ) const @@ -508,8 +501,7 @@ Foam::twoPhaseMixtureEThermo::kappaEff } -Foam::tmp -Foam::twoPhaseMixtureEThermo::kappaEff +Foam::tmp Foam::twoPhaseMixtureEThermo::kappaEff ( const scalarField& kappat, const label patchi @@ -528,8 +520,7 @@ Foam::twoPhaseMixtureEThermo::kappaEff } -Foam::tmp -Foam::twoPhaseMixtureEThermo::alphaEff +Foam::tmp Foam::twoPhaseMixtureEThermo::alphaEff ( const volScalarField& alphat ) const @@ -539,12 +530,11 @@ Foam::twoPhaseMixtureEThermo::alphaEff alpha1_*rho1() + (1.0 - alpha1_)*rho2() ); - return (kappa()/Cp()/rho + alphat); } -Foam::tmp -Foam::twoPhaseMixtureEThermo::alphaEff + +Foam::tmp Foam::twoPhaseMixtureEThermo::alphaEff ( const scalarField& alphat, const label patchi @@ -575,6 +565,7 @@ Foam::twoPhaseMixtureEThermo::alphaEff return kappa/Cp/rho + alphat; } + bool Foam::twoPhaseMixtureEThermo::read() { if (basicThermo::read() && thermoIncompressibleTwoPhaseMixture::read()) @@ -589,4 +580,5 @@ bool Foam::twoPhaseMixtureEThermo::read() } } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options index 0194820c91..1d4880f1ba 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options @@ -12,7 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ -lreactingPhaseSystem \ -lreactingMultiphaseSystem \ -lreactingEulerianInterfacialModels \ diff --git a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/files b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/files index 666a1c6b10..2d0b43d342 100644 --- a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/files +++ b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/files @@ -1,4 +1,4 @@ -autoRefineMesh.C +snappyRefineMesh.C -EXE = $(FOAM_APPBIN)/autoRefineMesh +EXE = $(FOAM_APPBIN)/snappyRefineMesh diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index ade260fd9c..235f81db47 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -1316,14 +1316,14 @@ int main(int argc, char *argv[]) Info<< surfaces.names()[surfi] << ':' << nl << nl; - const word& fzName = surfaces.surfZones()[surfI].faceZoneName(); + const word& fzName = surfaces.surfZones()[surfi].faceZoneName(); if (fzName.empty()) { // 'Normal' surface forAll(regNames, i) { - label globalRegioni = surfaces.globalRegion(surfI, i); + label globalRegioni = surfaces.globalRegion(surfi, i); label patchi; diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C index 39da68933e..11d6cfd523 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C @@ -392,7 +392,7 @@ Foam::label Foam::checkTopology // Already marked regionDisconnected[regioni] = false; } - else if (pRegion != regionI) + else if (pRegion != regioni) { // Multiple regions regionDisconnected[regioni] = false; diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C index 988415c4e4..7af8edb75a 100644 --- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C +++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) // Create mesh subsetting engine fvMeshSubset subsetter(mesh); - label patchi = -1; + labelList exposedPatchIDs; if (args.optionFound("patch")) { diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Allwmake b/applications/utilities/miscellaneous/foamDebugSwitches/Allwmake deleted file mode 100755 index edc1f5f0dd..0000000000 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Allwmake +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory - -if [ -f "$FFTW_ARCH_PATH/include/fftw3.h" ] || \ - [ "${FFTW_ARCH_PATH##*-}" = system -a -f "/usr/include/fftw3.h" ] -then - export LINK_FLAGS="-lrandomProcesses" -fi -wmake - -#------------------------------------------------------------------------------ diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 3196fadbd6..cab70e7076 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -1151,10 +1151,6 @@ int main(int argc, char *argv[]) // For the first region of a multi-region case additionally // decompose the "uniform" directory in the time directory if (regionNames.size() > 1 && regioni == 0) - - // If no fields have been decomposed the destination - // directory will not have been created so make sure. - mkDir(timePath); { decomposeUniform(copyUniform, mesh, processorDb); } diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C index df8bd3eeb3..047c68b21a 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C @@ -615,7 +615,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets) label zonei = faceToZone[curF]; - if (zoneI >= 0) + if (zonei >= 0) { // Single zone. Add the face zoneFaces[zonei].append(facei); diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C index 5b9dc19431..3df020099f 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C +++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -125,12 +125,8 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField PtrList> patchFields(fld.mesh().boundary().size()); - const typename GeometricField - < - Type, - fvPatchField, - volMesh - >::GeometricBoundaryField& bfld = fld.boundaryField(); + const typename GeometricField::Boundary& + bfld = fld.boundaryField(); forAll(bfld, patchI) { @@ -292,12 +288,8 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField PtrList> patchFields(fld.mesh().boundary().size()); - const typename GeometricField - < - Type, - fvsPatchField, - surfaceMesh - >::GeometricBoundaryField& bfld = fld.boundaryField(); + const typename GeometricField::Boundary& + bfld = fld.boundaryField(); forAll(bfld, patchI) { diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index dfe0340347..65ebbc1c6f 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -716,8 +716,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh) { GeoField& fld = *iter(); - typename GeoField::GeometricBoundaryField& bfld = - fld.boundaryField(); + typename GeoField::Boundary& bfld = fld.boundaryFieldRef(); if ( Pstream::defaultCommsType == Pstream::blocking @@ -728,7 +727,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh) forAll(bfld, patchi) { - typename GeoField::PatchFieldType& pfld = bfld[patchi]; + typename GeoField::Patch& pfld = bfld[patchi]; //if (pfld.coupled()) //if (isA(pfld)) @@ -750,7 +749,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh) forAll(bfld, patchi) { - typename GeoField::PatchFieldType& pfld = bfld[patchi]; + typename GeoField::Patch& pfld = bfld[patchi]; //if (pfld.coupled()) //if (isA(pfld)) @@ -768,7 +767,7 @@ void correctCoupledBoundaryConditions(fvMesh& mesh) forAll(patchSchedule, patchEvali) { label patchi = patchSchedule[patchEvali].patch; - typename GeoField::PatchFieldType& pfld = bfld[patchi]; + typename GeoField::Patch& pfld = bfld[patchi]; //if (pfld.coupled()) //if (isA(pfld)) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C index b6b058b2b9..6e7a2d24fe 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C @@ -70,12 +70,7 @@ tmp> volField ( const fvMeshSubset& meshSubsetter, - const typename GeometricField - < - Type, - fvPatchField, - volMesh - >::DimensionedInternalField& df + const typename GeometricField::Internal& df ) { // Construct volField (with zeroGradient) from dimensioned field @@ -93,7 +88,7 @@ volField zeroGradientFvPatchField::typeName ) ); - tvf.ref().internalField() = df; + tvf.ref().primitiveFieldRef() = df; tvf.ref().correctBoundaryConditions(); const GeometricField& vf = tvf(); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H index 813fea468e..93452d04d3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -60,7 +60,7 @@ volField Type, Foam::fvPatchField, Foam::volMesh - >::DimensionedInternalField& df + >::Internal& df ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C index 842bc95c79..d027e7afbb 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C @@ -186,11 +186,11 @@ int main(int argc, char *argv[]) volSymmTensorField::typeName, volTensorField::typeName, - volScalarField::DimensionedInternalField::typeName, - volVectorField::DimensionedInternalField::typeName, - volSphericalTensorField::DimensionedInternalField::typeName, - volSymmTensorField::DimensionedInternalField::typeName, - volTensorField::DimensionedInternalField::typeName + volScalarField::Internal::typeName, + volVectorField::Internal::typeName, + volSphericalTensorField::Internal::typeName, + volSymmTensorField::Internal::typeName, + volTensorField::Internal::typeName }; // Path to EnSight directory at case level only @@ -562,15 +562,10 @@ int main(int argc, char *argv[]) // DimensionedFields else if ( - volFieldTypes[i] - == volScalarField::DimensionedInternalField::typeName + volFieldTypes[i] == volScalarField::Internal::typeName ) { - volScalarField::DimensionedInternalField df - ( - fieldObject, - mesh - ); + volScalarField::Internal df(fieldObject, mesh); ensightField ( volField(meshSubsetter, df), @@ -585,15 +580,10 @@ int main(int argc, char *argv[]) } else if ( - volFieldTypes[i] - == volVectorField::DimensionedInternalField::typeName + volFieldTypes[i] == volVectorField::Internal::typeName ) { - volVectorField::DimensionedInternalField df - ( - fieldObject, - mesh - ); + volVectorField::Internal df(fieldObject, mesh); ensightField ( volField(meshSubsetter, df), @@ -609,14 +599,10 @@ int main(int argc, char *argv[]) else if ( volFieldTypes[i] - == volSphericalTensorField::DimensionedInternalField::typeName + == volSphericalTensorField::Internal::typeName ) { - volSphericalTensorField::DimensionedInternalField df - ( - fieldObject, - mesh - ); + volSphericalTensorField::Internal df(fieldObject, mesh); ensightField ( volField(meshSubsetter, df), @@ -631,15 +617,10 @@ int main(int argc, char *argv[]) } else if ( - volFieldTypes[i] - == volSymmTensorField::DimensionedInternalField::typeName + volFieldTypes[i] == volSymmTensorField::Internal::typeName ) { - volSymmTensorField::DimensionedInternalField df - ( - fieldObject, - mesh - ); + volSymmTensorField::Internal df(fieldObject, mesh); ensightField ( volField(meshSubsetter, df), @@ -654,15 +635,10 @@ int main(int argc, char *argv[]) } else if ( - volFieldTypes[i] - == volTensorField::DimensionedInternalField::typeName + volFieldTypes[i] == volTensorField::Internal::typeName ) { - volTensorField::DimensionedInternalField df - ( - fieldObject, - mesh - ); + volTensorField::Internal df(fieldObject, mesh); ensightField ( volField(meshSubsetter, df), diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index f5f6e019d6..c699c0ef03 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -618,11 +618,11 @@ int main(int argc, char *argv[]) // Construct dimensioned fields - PtrList dsf; - PtrList dvf; - PtrList dSpheretf; - PtrList dSymmtf; - PtrList dtf; + PtrList dsf; + PtrList dvf; + PtrList dSpheretf; + PtrList dSymmtf; + PtrList dtf; if (!specifiedFields || selectedFields.size()) { diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H index e478544bfb..b61cfd6377 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H @@ -98,7 +98,7 @@ public: template void write ( - const PtrList>& flds + const PtrList>& flds ); //- Interpolate and write volFields @@ -114,7 +114,7 @@ public: void write ( const volPointInterpolation&, - const PtrList>& + const PtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C index 0412336323..f5e3b1aa39 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C @@ -44,7 +44,7 @@ void Foam::internalWriter::write template void Foam::internalWriter::write ( - const PtrList>& flds + const PtrList>& flds ) { forAll(flds, i) @@ -79,7 +79,7 @@ template void Foam::internalWriter::write ( const volPointInterpolation& pInterp, - const PtrList>& flds + const PtrList>& flds ) { forAll(flds, i) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C index c38a77c74e..a6778a461c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C @@ -64,7 +64,7 @@ void Foam::writeFuns::write ( std::ostream& os, const bool binary, - const DimensionedField& vvf, + const DimensionedField& df, const vtkMesh& vMesh ) { @@ -74,19 +74,19 @@ void Foam::writeFuns::write label nValues = mesh.nCells() + superCells.size(); - os << vvf.name() << ' ' + os << df.name() << ' ' << int(pTraits::nComponents) << ' ' << nValues << " float" << std::endl; DynamicList fField(pTraits::nComponents*nValues); - insert(vvf.primitiveField(), fField); + insert(df.field(), fField); forAll(superCells, superCelli) { label origCelli = superCells[superCelli]; - insert(vvf[origCelli], fField); + insert(df[origCelli], fField); } write(os, binary, fField); } diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C index 7e8c022250..f54b9b04a4 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C @@ -116,11 +116,11 @@ void Foam::writeVTKFields Info<< " writing field " << fieldNames[fieldi] << endl; os << nl << fieldNames[fieldi] << ' ' << int(pTraits::nComponents) << ' ' - << values[fieldI].size() << " float" << nl; + << values[fieldi].size() << " float" << nl; label offset = 0; - forAll(addr, trackI) + forAll(addr, tracki) { - const List