From b8d5880447dafefebd46edb527847fa15d466dac Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 7 Nov 2017 11:22:58 +0000 Subject: [PATCH 1/3] STYLE: Header clean-up --- .../BCs/T/smoluchowskiJumpTFvPatchScalarField.H | 7 ++++--- .../chtMultiRegionFoam/solid/solidRegionDiffNo.H | 4 ++-- .../twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H | 4 ++-- .../diameterModels/constantDiameter/constantDiameter.H | 4 ++-- .../diameterModels/isothermalDiameter/isothermalDiameter.H | 6 +++--- .../saturationModels/function1/function1.H | 4 ++-- .../diameterModels/constantDiameter/constantDiameter.H | 4 ++-- .../diameterModels/isothermalDiameter/isothermalDiameter.H | 4 ++-- .../surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H | 4 ++-- etc/caseDicts/postProcessing/flowRate/flowRateFaceZone | 2 +- etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg | 4 ++-- .../functions/Function1/Function1/Function1Fwd.H | 4 ++-- .../alphatPhaseChangeWallFunctionFvPatchScalarField.H | 4 ++-- .../alphatWallFunctionFvPatchScalarField.H | 4 ++-- .../turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H | 4 ++-- .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H | 4 ++-- ...entMixingLengthDissipationRateInletFvPatchScalarField.H | 4 ++-- .../porousBafflePressureFvPatchFieldFwd.H | 4 ++-- src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H | 4 ++-- src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H | 4 ++-- .../fixedFluxExtrapolatedPressureFvPatchScalarField.H | 4 ++-- .../fixedFluxPressureFvPatchScalarField.H | 4 ++-- .../freestreamPressureFvPatchScalarField.H | 4 ++-- .../supersonicFreestreamFvPatchVectorField.H | 4 ++-- .../field/streamLine/streamLineParticleCloud.H | 4 ++-- .../wallBoundedStreamLineParticleCloud.H | 4 ++-- .../parcels/include/makeParcelDispersionModels.H | 4 ++-- .../cloudAbsorptionEmission/cloudAbsorptionEmission.H | 4 ++-- .../addOns/radiation/scatter/cloudScatter/cloudScatter.H | 4 ++-- .../parcels/include/makeParcelTurbulenceDispersionModels.H | 4 ++-- .../parcels/include/makeThermoParcelTurbulenceForces.H | 4 ++-- .../mappedVariableThicknessWallFvPatch.H | 4 ++-- src/sampling/meshToMesh0/meshToMesh0.H | 4 ++-- .../reduction/noChemistryReduction/noChemistryReduction.H | 4 ++-- .../tabulation/ISAT/binaryNode/binaryNode.H | 4 ++-- .../chemistrySolver/noChemistrySolver/noChemistrySolver.H | 4 ++-- .../MarshakRadiation/MarshakRadiationFvPatchScalarField.H | 4 ++-- src/thermophysicalModels/radiation/radiationModels/P1/P1.H | 4 ++-- .../fvDOM/blackBodyEmission/blackBodyEmission.H | 4 ++-- .../radiation/radiationModels/fvDOM/fvDOM/fvDOM.H | 4 ++-- .../radiation/radiationModels/solarLoad/solarLoad.H | 4 ++-- .../radiation/radiationModels/viewFactor/viewFactor.H | 4 ++-- .../absorptionEmissionModel/absorptionEmissionModel.H | 4 ++-- .../binaryAbsorptionEmission/binaryAbsorptionEmission.H | 4 ++-- .../constantAbsorptionEmission.H | 4 ++-- .../noAbsorptionEmission/noAbsorptionEmission.H | 4 ++-- .../scatterModel/constantScatter/constantScatter.H | 4 ++-- .../radiation/submodels/scatterModel/noScatter/noScatter.H | 4 ++-- .../radiation/submodels/sootModel/sootModel/sootModel.H | 4 ++-- .../constantTransmissivity/constantTransmissivity.H | 4 ++-- .../noTransmissivity/noTransmissivity.H | 4 ++-- .../reactionThermo/psiuReactionThermo/heheuPsiThermo.H | 4 ++-- .../solidSpecie/reaction/reactions/makeSolidReaction.H | 4 ++-- tutorials/IO/fileHandler/0/U | 4 ++-- tutorials/IO/fileHandler/constant/g | 4 ++-- tutorials/IO/fileHandler/constant/kinematicCloudPositions | 4 ++-- tutorials/IO/fileHandler/constant/kinematicCloudProperties | 4 ++-- tutorials/IO/fileHandler/constant/transportProperties | 4 ++-- tutorials/IO/fileHandler/constant/turbulenceProperties | 4 ++-- tutorials/IO/fileHandler/system/blockMeshDict | 4 ++-- tutorials/IO/fileHandler/system/controlDict | 4 ++-- tutorials/IO/fileHandler/system/decomposeParDict | 4 ++-- tutorials/IO/fileHandler/system/fvSchemes | 4 ++-- tutorials/IO/fileHandler/system/fvSolution | 4 ++-- .../mixerVesselAMI2D/0/U | 4 ++-- .../mixerVesselAMI2D/constant/dynamicMeshDict | 4 ++-- .../mixerVesselAMI2D/constant/g | 4 ++-- .../mixerVesselAMI2D/constant/kinematicCloudPositions | 4 ++-- .../mixerVesselAMI2D/constant/kinematicCloudProperties | 4 ++-- .../mixerVesselAMI2D/constant/transportProperties | 4 ++-- .../mixerVesselAMI2D/constant/turbulenceProperties | 4 ++-- .../mixerVesselAMI2D/system/blockMeshDict.m4 | 4 ++-- .../mixerVesselAMI2D/system/controlDict | 4 ++-- .../mixerVesselAMI2D/system/fvSchemes | 4 ++-- .../mixerVesselAMI2D/system/fvSolution | 4 ++-- .../reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh | 4 ++-- .../lagrangian/reactingParcelFoam/filter/0.orig/p_rgh | 4 ++-- .../lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh | 4 ++-- .../reactingParcelFoam/verticalChannel/0.orig/p_rgh | 4 ++-- .../reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh | 4 ++-- tutorials/mesh/parallel/filter/0.orig/p_rgh | 4 ++-- 81 files changed, 164 insertions(+), 163 deletions(-) diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H index 03625d8968..a854e75458 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef smoluchowskiJumpTFvPatchScalarFields_H -#define smoluchowskiJumpTFvPatchScalarFields_H +#ifndef smoluchowskiJumpTFvPatchScalarField_H +#define smoluchowskiJumpTFvPatchScalarField_H #include "mixedFvPatchFields.H" @@ -43,7 +43,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class smoluchowskiJumpTFvPatch Declaration + Class smoluchowskiJumpTFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ class smoluchowskiJumpTFvPatchScalarField @@ -74,6 +74,7 @@ class smoluchowskiJumpTFvPatchScalarField //- Heat capacity ratio (default 1.4) scalar gamma_; + public: //- Runtime type information diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H index 797bb765a0..3dd4e261ad 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H @@ -27,8 +27,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef solidRegionDiff_H -#define solidRegionDiff_H +#ifndef solidRegionDiffNo_H +#define solidRegionDiffNo_H #include "fvMesh.H" diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H index cc61acf674..cdeb8aaf2a 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef flashThermo_H -#define flashThermo_H +#ifndef twoPhaseMixtureEThermo_H +#define twoPhaseMixtureEThermo_H #include "volFields.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H index 738b7ae570..ab24c73736 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef constant_H -#define constant_H +#ifndef diameterModels_constant_H +#define diameterModels_constant_H #include "diameterModel.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H index 0d155ad16e..8bdb54eff6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::isothermal + Foam::diameterModels::isothermal Description Isothermal dispersed-phase particle diameter model. @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef isothermal_H -#define isothermal_H +#ifndef diameterModels_isothermal_H +#define diameterModels_isothermal_H #include "diameterModel.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H index bbac62d50b..23710027e3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H @@ -72,8 +72,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef function1_saturationModel_H -#define function1_saturationModel_H +#ifndef saturationModels_function1_H +#define saturationModels_function1_H #include "saturationModel.H" #include "Function1.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H index 6f616c6f73..fbf20426e8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef constant_H -#define constant_H +#ifndef diameterModels_constant_H +#define diameterModels_constant_H #include "diameterModel.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H index 6e997a210a..1d83bc575a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef isothermal_H -#define isothermal_H +#ifndef diameterModels_isothermal_H +#define diameterModels_isothermal_H #include "diameterModel.H" diff --git a/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H index e17039cd03..53c4fa494e 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H +++ b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H @@ -33,8 +33,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef IndexedPolyhedron_H -#define IndexedPolyhedron_H +#ifndef CGALIndexedPolyhedron_H +#define CGALIndexedPolyhedron_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone index ed81df016e..5158dde377 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone +++ b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Web: www.OpenFOAM.org + \\ / A nd | Web: www.OpenFOAM.com \\/ M anipulation | ------------------------------------------------------------------------------- Description diff --git a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg index b68815887d..1ba17a794f 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg +++ b/etc/caseDicts/postProcessing/flowRate/flowRateFaceZone.cfg @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H index 6e3b14ba0c..ad78b17f55 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1Fwd.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef Function1Fws_H -#define Function1Fws_H +#ifndef Function1Fwd_H +#define Function1Fwd_H #include "Function1.H" #include "vector.H" diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H index 763e71df51..8184600ff1 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H @@ -39,8 +39,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressibleAlphatPhaseChangeWallFunctionFvPatchScalarField_H -#define compressibleAlphatPhaseChangeWallFunctionFvPatchScalarField_H +#ifndef compressible_alphatPhaseChangeWallFunctionFvPatchScalarField_H +#define compressible_alphatPhaseChangeWallFunctionFvPatchScalarField_H #include "fixedValueFvPatchFields.H" diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index ca4c35bc5d..8aeddced40 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -72,8 +72,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressibleAlphatWallFunctionFvPatchScalarField_H -#define compressibleAlphatWallFunctionFvPatchScalarField_H +#ifndef compressible_alphatWallFunctionFvPatchScalarField_H +#define compressible_alphatWallFunctionFvPatchScalarField_H #include "fixedValueFvPatchFields.H" diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H index eef6e95959..55b0332e84 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H @@ -34,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef IDDESDeltaDelta_H -#define IDDESDeltaDelta_H +#ifndef LESModels_IDDESDelta_H +#define LESModels_IDDESDelta_H #include "maxDeltaxyz.H" diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H index de43981322..f981aaf6ea 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef maxDeltaxyzDelta_H -#define maxDeltaxyzDelta_H +#ifndef LESModels_maxDeltaxyz_H +#define LESModels_maxDeltaxyz_H #include "LESdelta.H" diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H index d71c85ea81..2a4ab54c60 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H @@ -74,8 +74,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef turbulentMixingLengthDissipationRateInlet_H -#define turbulentMixingLengthDissipationRateInlet_H +#ifndef turbulentMixingLengthDissipationRateInletFvPatchScalarField_H +#define turbulentMixingLengthDissipationRateInletFvPatchScalarField_H #include "inletOutletFvPatchFields.H" diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H index 946f45d076..2e5d92089c 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef porousBafflePressureFvPatchFieldsFwd_H -#define porousBafflePressureFvPatchFieldsFwd_H +#ifndef porousBafflePressureFvPatchFieldFwd_H +#define porousBafflePressureFvPatchFieldFwd_H #include "fieldTypes.H" diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H index 1b6499934f..1adaed982b 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H @@ -33,8 +33,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef SRFModelRpm_H -#define SRFModelRpm_H +#ifndef SRF_rpm_H +#define SRF_rpm_H #include "SRFModel.H" diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H index 3d4ffefe35..a173f7c6dd 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H +++ b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef options_H -#define options_H +#ifndef fv_options_H +#define fv_options_H #include "fvOptionList.H" #include "IOdictionary.H" diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H index 1bdaee71b8..9a1f051bf7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxExtrapolatedPressure/fixedFluxExtrapolatedPressureFvPatchScalarField.H @@ -48,8 +48,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef fixedFluxExtrapolatedPressureFvPatchScalarFields_H -#define fixedFluxExtrapolatedPressureFvPatchScalarFields_H +#ifndef fixedFluxExtrapolatedPressureFvPatchScalarField_H +#define fixedFluxExtrapolatedPressureFvPatchScalarField_H #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H index aaafe055a9..94bfcf9fee 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.H @@ -48,8 +48,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef fixedFluxPressureFvPatchScalarFields_H -#define fixedFluxPressureFvPatchScalarFields_H +#ifndef fixedFluxPressureFvPatchScalarField_H +#define fixedFluxPressureFvPatchScalarField_H #include "fvPatchFields.H" #include "fixedGradientFvPatchFields.H" diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H index e8b5f28114..950e890845 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.H @@ -60,8 +60,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef freestreamPressureFvPatchScalarFields_H -#define freestreamPressureFvPatchScalarFields_H +#ifndef freestreamPressureFvPatchScalarField_H +#define freestreamPressureFvPatchScalarField_H #include "fvPatchFields.H" #include "zeroGradientFvPatchFields.H" diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H index 54d0e92a69..69a6a04eab 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H @@ -69,8 +69,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef supersonicFreestreamFvPatchVectorFields_H -#define supersonicFreestreamFvPatchVectorFields_H +#ifndef supersonicFreestreamFvPatchVectorField_H +#define supersonicFreestreamFvPatchVectorField_H #include "fvPatchFields.H" #include "mixedFvPatchFields.H" diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/functionObjects/field/streamLine/streamLineParticleCloud.H index 9fdbad50f5..dfe1461a7e 100644 --- a/src/functionObjects/field/streamLine/streamLineParticleCloud.H +++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef streamLineCloud_H -#define streamLineCloud_H +#ifndef streamLineParticleCloud_H +#define streamLineParticleCloud_H #include "Cloud.H" #include "streamLineParticle.H" diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H index 8ce123d6a5..dc270ffa0d 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef streamLineCloud_H -#define streamLineCloud_H +#ifndef wallBoundedStreamLineParticleCloud_H +#define wallBoundedStreamLineParticleCloud_H #include "Cloud.H" #include "wallBoundedStreamLineParticle.H" diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H index 855d307277..bbff6f2de6 100644 --- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H +++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef makeParcelDispersionModels_h -#define makeParcelDispersionModels_h +#ifndef makeParcelDispersionModels_H +#define makeParcelDispersionModels_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H index 99a63183a2..336b29a1aa 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationCloudAbsorptionEmission_H -#define radiationCloudAbsorptionEmission_H +#ifndef radiation_cloudAbsorptionEmission_H +#define radiation_cloudAbsorptionEmission_H #include "absorptionEmissionModel.H" diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H index fa4a933808..44b6de546c 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationCloudScatter_H -#define radiationCloudScatter_H +#ifndef radiation_cloudScatter_H +#define radiation_cloudScatter_H #include "scatterModel.H" diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H index f10a122057..7d3473b062 100644 --- a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H +++ b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef makeParcelTurbulenceDispersionModels_h -#define makeParcelTurbulenceDispersionModels_h +#ifndef makeParcelTurbulenceDispersionModels_H +#define makeParcelTurbulenceDispersionModels_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H index db6d224dd3..fccd7734b0 100644 --- a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H +++ b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef makeThermoParcelTurbulenceForces_h -#define makeThermoParcelTurbulenceForces_h +#ifndef makeThermoParcelTurbulenceForces_H +#define makeThermoParcelTurbulenceForces_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H index f4709bb62e..cb3185cbad 100644 --- a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H +++ b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.H @@ -37,8 +37,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef mappedWallFvPatch_H -#define mappedWallFvPatch_H +#ifndef mappedVariableThicknessWallFvPatch_H +#define mappedVariableThicknessWallFvPatch_H #include "wallFvPatch.H" #include "mappedVariableThicknessWallPolyPatch.H" diff --git a/src/sampling/meshToMesh0/meshToMesh0.H b/src/sampling/meshToMesh0/meshToMesh0.H index 885d4baeb0..989173f073 100644 --- a/src/sampling/meshToMesh0/meshToMesh0.H +++ b/src/sampling/meshToMesh0/meshToMesh0.H @@ -38,8 +38,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef meshtoMesh_H -#define meshtoMesh_H +#ifndef meshToMesh0_H +#define meshToMesh0_H #include "fvMesh.H" #include "HashTable.H" diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReduction.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReduction.H index e3bbc0b433..cde61c91b7 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReduction.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/noChemistryReduction/noChemistryReduction.H @@ -31,8 +31,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef none_H -#define none_H +#ifndef chemistryReductionMethods_none_H +#define chemistryReductionMethods_none_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryNode/binaryNode.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryNode/binaryNode.H index 99952a51f6..d321fff580 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryNode/binaryNode.H +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryNode/binaryNode.H @@ -32,8 +32,8 @@ SourceFile \*---------------------------------------------------------------------------*/ -#ifndef BINARY_NODE_H -#define BINARY_NODE_H +#ifndef binaryNode_H +#define binaryNode_H #include "chemPointISAT.H" diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H index e0f5db3f60..d37290e016 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/noChemistrySolver/noChemistrySolver.H @@ -33,8 +33,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef noChemistySolver_H -#define noChemistySolver_H +#ifndef noChemistrySolver_H +#define noChemistrySolver_H #include "chemistrySolver.H" diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H index d175c9e358..5e9b7a1138 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H @@ -59,8 +59,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef MarshakRadiationMixedFvPatchField_H -#define MarshakRadiationMixedFvPatchField_H +#ifndef radiation_MarshakRadiationFvPatchScalarField_H +#define radiation_MarshakRadiationFvPatchScalarField_H #include "mixedFvPatchFields.H" diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H index e52733e3ea..6532f8223c 100644 --- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.H +++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.H @@ -41,8 +41,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationModelP1_H -#define radiationModelP1_H +#ifndef radiation_P1_H +#define radiation_P1_H #include "radiationModel.H" #include "volFields.H" diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H index d7f175fc5c..c22319fc24 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef blackModyEmission_H -#define blackModyEmission_H +#ifndef radiation_blackBodyEmission_H +#define radiation_blackBodyEmission_H #include "volFields.H" #include "dimensionedScalar.H" diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H index 3c00d3b287..419389c30c 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H @@ -74,8 +74,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationModelfvDOM_H -#define radiationModelfvDOM_H +#ifndef radiation_fvDOM_H +#define radiation_fvDOM_H #include "radiativeIntensityRay.H" #include "radiationModel.H" diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H index 52e2e9a36e..be1e993710 100644 --- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H +++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H @@ -59,8 +59,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationModelsolarLoad_H -#define radiationModelsolarLoad_H +#ifndef radiation_solarLoad_H +#define radiation_solarLoad_H #include "radiationModel.H" #include "singleCellFvMesh.H" diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H index 5bd75d92ae..92ec802b45 100644 --- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H +++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H @@ -45,8 +45,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationModelviewFactor_H -#define radiationModelviewFactor_H +#ifndef radiation_viewFactor_H +#define radiation_viewFactor_H #include "radiationModel.H" #include "singleCellFvMesh.H" diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H index f02d4a079d..8350cba6f7 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H @@ -30,8 +30,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef radiationAbsorptionEmissionModel_H -#define radiationAbsorptionEmissionModel_H +#ifndef radiation_absorptionEmissionModel_H +#define radiation_absorptionEmissionModel_H #include "IOdictionary.H" #include "autoPtr.H" diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H index 2771f938b6..cf9397aac5 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationBinaryAbsorptionEmission_H -#define radiationBinaryAbsorptionEmission_H +#ifndef radiation_binaryAbsorptionEmission_H +#define radiation_binaryAbsorptionEmission_H #include "absorptionEmissionModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H index 357a31d2ba..18fc7f349e 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H @@ -36,8 +36,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationConstantAbsorptionEmission_H -#define radiationConstantAbsorptionEmission_H +#ifndef radiation_constantAbsorptionEmission_H +#define radiation_constantAbsorptionEmission_H #include "absorptionEmissionModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H index 011df68dbb..23ab5e9bb3 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationNoAbsorptionEmission_H -#define radiationNoAbsorptionEmission_H +#ifndef radiation_noAbsorptionEmission_H +#define radiation_noAbsorptionEmission_H #include "absorptionEmissionModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H index ac6357c355..ccf024e6b2 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationConstantScatter_H -#define radiationConstantScatter_H +#ifndef radiation_constantScatter_H +#define radiation_constantScatter_H #include "scatterModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.H b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.H index 095b4d9669..2fb19569df 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.H +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationNoScatter_H -#define radiationNoScatter_H +#ifndef radiation_noScatter_H +#define radiation_noScatter_H #include "scatterModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.H b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.H index a3c2dee676..2967f4c959 100644 --- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.H +++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModel.H @@ -29,8 +29,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef radiationsootModel_H -#define radiationsootModel_H +#ifndef radiation_sootModel_H +#define radiation_sootModel_H #include "IOdictionary.H" #include "autoPtr.H" diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H index 44593c42eb..e06c4e4829 100644 --- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H +++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationConstantTransmissivity_H -#define radiationConstantTransmissivity_H +#ifndef radiation_constantTransmissivity_H +#define radiation_constantTransmissivity_H #include "transmissivityModel.H" diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H index 517bf43771..9d264f82c6 100644 --- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H +++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/noTransmissivity/noTransmissivity.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef radiationConstantScatter_H -#define radiationConstantScatter_H +#ifndef radiation_noTransmissivity_H +#define radiation_noTransmissivity_H #include "transmissivityModel.H" diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H index 725ce90e3a..4506f4cb6e 100644 --- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H +++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef heheuReactionThermo_H -#define heheuReactionThermo_H +#ifndef heheuPsiThermo_H +#define heheuPsiThermo_H #include "heThermo.H" diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H index b5444f1e59..b278c3c460 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H @@ -29,8 +29,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef makeSolidReactionThermo_H -#define makeSolidReactionThermo_H +#ifndef makeSolidReaction_H +#define makeSolidReaction_H #include "solidReaction.H" #include "IrreversibleReaction.H" diff --git a/tutorials/IO/fileHandler/0/U b/tutorials/IO/fileHandler/0/U index 75ed42fbdb..04b73f9a93 100644 --- a/tutorials/IO/fileHandler/0/U +++ b/tutorials/IO/fileHandler/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/constant/g b/tutorials/IO/fileHandler/constant/g index 0cc222ca34..4702e33f63 100644 --- a/tutorials/IO/fileHandler/constant/g +++ b/tutorials/IO/fileHandler/constant/g @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudPositions b/tutorials/IO/fileHandler/constant/kinematicCloudPositions index 1e2be4ebc8..f2d697e58e 100644 --- a/tutorials/IO/fileHandler/constant/kinematicCloudPositions +++ b/tutorials/IO/fileHandler/constant/kinematicCloudPositions @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/constant/kinematicCloudProperties b/tutorials/IO/fileHandler/constant/kinematicCloudProperties index 41b8c64e80..a52b7d2a0a 100644 --- a/tutorials/IO/fileHandler/constant/kinematicCloudProperties +++ b/tutorials/IO/fileHandler/constant/kinematicCloudProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/constant/transportProperties b/tutorials/IO/fileHandler/constant/transportProperties index dbbab9e9f0..375de07712 100644 --- a/tutorials/IO/fileHandler/constant/transportProperties +++ b/tutorials/IO/fileHandler/constant/transportProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/constant/turbulenceProperties b/tutorials/IO/fileHandler/constant/turbulenceProperties index c2c3b28a1b..5eec042672 100644 --- a/tutorials/IO/fileHandler/constant/turbulenceProperties +++ b/tutorials/IO/fileHandler/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/system/blockMeshDict b/tutorials/IO/fileHandler/system/blockMeshDict index 359a48779a..f67edf5308 100644 --- a/tutorials/IO/fileHandler/system/blockMeshDict +++ b/tutorials/IO/fileHandler/system/blockMeshDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/system/controlDict b/tutorials/IO/fileHandler/system/controlDict index 2ac8dc5787..d209035821 100644 --- a/tutorials/IO/fileHandler/system/controlDict +++ b/tutorials/IO/fileHandler/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/system/decomposeParDict b/tutorials/IO/fileHandler/system/decomposeParDict index 0f07bb6aa8..341581df06 100644 --- a/tutorials/IO/fileHandler/system/decomposeParDict +++ b/tutorials/IO/fileHandler/system/decomposeParDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/system/fvSchemes b/tutorials/IO/fileHandler/system/fvSchemes index 12c112d4e0..2d03757154 100644 --- a/tutorials/IO/fileHandler/system/fvSchemes +++ b/tutorials/IO/fileHandler/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/IO/fileHandler/system/fvSolution b/tutorials/IO/fileHandler/system/fvSolution index 740eb61a4b..b72ad9583f 100644 --- a/tutorials/IO/fileHandler/system/fvSolution +++ b/tutorials/IO/fileHandler/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U index 843a28d50f..8a3472efb1 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict index 180fa548d9..098df40ce8 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g index 7db1127c4e..e385acd7d9 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions index 72e44ae6a1..0e75a13567 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties index d2c439ffa1..dc1b7a9f5c 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties index 3a1bb800c6..104081599a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties index c2c3b28a1b..5eec042672 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 index d6cc8a50c8..9b6f8a5e2b 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict index 3bf92c6e36..245a1149e0 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes index 9c5ef53090..93fc843478 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution index b0b21145a2..cb6c43877e 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh index b51753afdf..430890dd3c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh index 889e4cf111..42af2c294a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh index 14453a3968..70182381f8 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh index 462a0fa105..616e1c783f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh index bab3fe3b90..6d61fe5976 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/mesh/parallel/filter/0.orig/p_rgh b/tutorials/mesh/parallel/filter/0.orig/p_rgh index 889e4cf111..42af2c294a 100644 --- a/tutorials/mesh/parallel/filter/0.orig/p_rgh +++ b/tutorials/mesh/parallel/filter/0.orig/p_rgh @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | +| \\ / O peration | Version: plus | +| \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile From c1b7854cf70d84dedbc8cf39f76b034201ab9111 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 7 Nov 2017 11:31:21 +0000 Subject: [PATCH 2/3] COMP: Removed unused variable --- src/lagrangian/basic/particle/particleIO.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lagrangian/basic/particle/particleIO.C b/src/lagrangian/basic/particle/particleIO.C index 5ed13963da..8115ad62f5 100644 --- a/src/lagrangian/basic/particle/particleIO.C +++ b/src/lagrangian/basic/particle/particleIO.C @@ -199,7 +199,6 @@ void Foam::particle::writePosition(Ostream& os) const p.position = position(); p.celli = celli_; - vector pos(position()); os.write(reinterpret_cast(&p.position), s); } From ec9a7cc0164f6d49208d509d552a2d623319fd85 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 7 Nov 2017 17:33:09 +0000 Subject: [PATCH 3/3] ENH: function objects - enabled 'fields' entry to use patterns for some objects --- .../postProcessing/postProcess/postProcess.C | 21 ++- .../db/functionObjects/writeFile/writeFile.C | 25 +++- .../db/functionObjects/writeFile/writeFile.H | 6 + .../include/addFunctionObjectOptions.H | 3 +- src/finiteVolume/Make/files | 4 + .../fieldSelection/fieldSelection.C | 85 +++++++++++ .../fieldSelection/fieldSelection.H | 139 ++++++++++++++++++ .../fieldSelection/fieldSelectionTemplates.C | 47 ++++++ .../fieldSelection/fileFieldSelection.C | 64 ++++++++ .../fieldSelection/fileFieldSelection.H | 115 +++++++++++++++ .../fileFieldSelectionTemplates.C | 77 ++++++++++ .../fieldSelection/solverFieldSelection.C | 81 ++++++++++ .../fieldSelection/solverFieldSelection.H | 89 +++++++++++ .../fieldSelection/volFieldSelection.C | 61 ++++++++ .../fieldSelection/volFieldSelection.H | 104 +++++++++++++ .../volFieldSelectionTemplates.C | 44 ++++++ .../fieldCoordinateSystemTransform.C | 32 ++-- .../fieldCoordinateSystemTransform.H | 3 +- .../field/fieldMinMax/fieldMinMax.C | 48 ++++-- .../field/fieldMinMax/fieldMinMax.H | 7 +- .../field/nearWallFields/nearWallFields.H | 2 +- .../regionSizeDistribution.C | 2 +- .../utilities/residuals/residuals.C | 46 +++--- .../utilities/residuals/residuals.H | 7 +- 24 files changed, 1043 insertions(+), 69 deletions(-) create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fieldSelection.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H create mode 100644 src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H create mode 100644 src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.C create mode 100644 src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H create mode 100644 src/finiteVolume/functionObjects/fieldSelection/volFieldSelectionTemplates.C diff --git a/applications/utilities/postProcessing/postProcess/postProcess.C b/applications/utilities/postProcessing/postProcess/postProcess.C index 8a01c21eb4..884fe1d398 100644 --- a/applications/utilities/postProcessing/postProcess/postProcess.C +++ b/applications/utilities/postProcessing/postProcess/postProcess.C @@ -39,6 +39,7 @@ Description #include "surfaceFields.H" #include "pointFields.H" #include "uniformDimensionedFields.H" +#include "fileFieldSelection.H" using namespace Foam; @@ -153,14 +154,14 @@ int main(int argc, char *argv[]) #include "createNamedMesh.H" // Initialize the set of selected fields from the command-line options - HashSet selectedFields; + functionObjects::fileFieldSelection fields(mesh); if (args.optionFound("fields")) { - args.optionLookup("fields")() >> selectedFields; + args.optionLookup("fields")() >> fields; } if (args.optionFound("field")) { - selectedFields.insert(args.optionLookup("field")()); + fields.insert(args.optionLookup("field")()); } // Externally stored dictionary for functionObjectList @@ -170,7 +171,13 @@ int main(int argc, char *argv[]) // Construct functionObjectList autoPtr functionsPtr ( - functionObjectList::New(args, runTime, functionsDict, selectedFields) + functionObjectList::New + ( + args, + runTime, + functionsDict, + fields.selection() + ) ); forAll(timeDirs, timei) @@ -179,6 +186,8 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << endl; + fields.updateSelection(); + if (mesh.readUpdate() != polyMesh::UNCHANGED) { // Update functionObjectList if mesh changes @@ -187,7 +196,7 @@ int main(int argc, char *argv[]) args, runTime, functionsDict, - selectedFields + fields.selection() ); } @@ -200,7 +209,7 @@ int main(int argc, char *argv[]) args, runTime, mesh, - selectedFields, + fields.selection(), functionsPtr(), timei == timeDirs.size()-1 ); diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C index 3c71b2713d..60a2a8b764 100644 --- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C +++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C @@ -150,7 +150,8 @@ Foam::functionObjects::writeFile::writeFile fileName_("undefined"), filePtr_(), writePrecision_(IOstream::defaultPrecision()), - writeToFile_(true) + writeToFile_(true), + writtenHeader_(false) {} @@ -167,7 +168,8 @@ Foam::functionObjects::writeFile::writeFile fileName_(fileName), filePtr_(), writePrecision_(IOstream::defaultPrecision()), - writeToFile_(true) + writeToFile_(true), + writtenHeader_(false) { read(dict); @@ -234,8 +236,13 @@ void Foam::functionObjects::writeFile::writeCommented const string& str ) const { - os << setw(1) << "#" << setw(1) << ' ' - << setf(ios_base::left) << setw(charWidth() - 2) << str.c_str(); + os << setw(1) << "#"; + + if (str.size()) + { + os << setw(1) << ' ' + << setf(ios_base::left) << setw(charWidth() - 2) << str.c_str(); + } } @@ -255,8 +262,8 @@ void Foam::functionObjects::writeFile::writeHeader const string& str ) const { - os << setw(1) << "#" << setw(1) << ' ' - << setf(ios_base::left) << setw(charWidth() - 2) << str.c_str() << nl; + writeCommented(os, str); + os << nl; } @@ -267,4 +274,10 @@ void Foam::functionObjects::writeFile::writeTime(Ostream& os) const } +void Foam::functionObjects::writeFile::writeBreak(Ostream& os) const +{ + writeHeader(os, "==="); +} + + // ************************************************************************* // diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H index 1f7f1edfce..918d86a133 100644 --- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H +++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H @@ -79,6 +79,9 @@ protected: //- Flag to enable/disable writing to file bool writeToFile_; + //- Flag to identify whether the header has been written + bool writtenHeader_; + // Protected Member Functions @@ -171,6 +174,9 @@ public: //- Write the current time to stream virtual void writeTime(Ostream& os) const; + //- Write a break marker to the stream + virtual void writeBreak(Ostream& os) const; + //- Write a (commented) header property and value pair template void writeHeaderValue diff --git a/src/OpenFOAM/include/addFunctionObjectOptions.H b/src/OpenFOAM/include/addFunctionObjectOptions.H index 7747c16d4f..35f8503e7d 100644 --- a/src/OpenFOAM/include/addFunctionObjectOptions.H +++ b/src/OpenFOAM/include/addFunctionObjectOptions.H @@ -9,8 +9,7 @@ Foam::argList::addOption ( "fields", "list", - "Specify a list of fields to be processed, e.g. '(U T p)' - " - "regular expressions not currently supported" + "Specify a list of fields to be processed, e.g. '(U T p)'" ); Foam::argList::addOption ( diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index abdef09778..db88df52ae 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -93,6 +93,10 @@ $(faceToCell)/MeshObjects/centredCFCFaceToCellStencilObject.C functionObjects/fvMeshFunctionObject/fvMeshFunctionObject.C functionObjects/volRegion/volRegion.C +functionObjects/fieldSelection/fieldSelection.C +functionObjects/fieldSelection/fileFieldSelection.C +functionObjects/fieldSelection/volFieldSelection.C +functionObjects/fieldSelection/solverFieldSelection.C fvPatchFields = fields/fvPatchFields $(fvPatchFields)/fvPatchField/fvPatchFields.C diff --git a/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.C b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.C new file mode 100644 index 0000000000..b8f9ad29ba --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.C @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "fieldSelection.H" +#include "objectRegistry.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::fieldSelection::fieldSelection +( + const objectRegistry& obr +) +: + HashSet(), + obr_(obr), + selection_() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::functionObjects::fieldSelection::~fieldSelection() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::fieldSelection::read(const dictionary& dict) +{ + dict.lookup("fields") >> *this; + + return true; +} + + +bool Foam::functionObjects::fieldSelection::containsPattern() const +{ + for (const wordRe& fieldName : *this) + { + if (fieldName.isPattern()) + { + return true; + } + } + + return false; +} + + +void Foam::functionObjects::fieldSelection::clearSelection() +{ + selection_.clear(); +} + + +bool Foam::functionObjects::fieldSelection::updateSelection() +{ + return false; +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H new file mode 100644 index 0000000000..9d874f8322 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fieldSelection.H @@ -0,0 +1,139 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::functionObjects::fieldSelection + +Description + Helper class to manage field selections + +SourceFiles + fieldSelection.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjects_fieldSelection_H +#define functionObjects_fieldSelection_H + +#include "HashSet.H" +#include "wordRe.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +class dictionary; +class objectRegistry; + +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class fieldSelection Declaration +\*---------------------------------------------------------------------------*/ + +class fieldSelection +: + public HashSet +{ +private: + + // Private Member Functions + + //- Disallow default bitwise copy construct + fieldSelection(const fieldSelection&) = delete; + + +protected: + + // Protected member data + + //- Reference to the database + const objectRegistry& obr_; + + //- Current field selection + wordHashSet selection_; + + + // Protected Member Functions + + //- Add registered objects of a given type + template + void addRegistered(wordHashSet& set) const; + + +public: + + //- Construct from object registry + fieldSelection(const objectRegistry& obr); + + + //- Destructor + virtual ~fieldSelection(); + + + // Member Functions + + //- Return the current field selection + const wordHashSet& selection() const + { + return selection_; + } + + //- Return the current field selection + wordHashSet& selection() + { + return selection_; + } + + //- Read the fieldSelection data from dictionary + virtual bool read(const dictionary& dict); + + //- Return whether the field names contain a pattern + virtual bool containsPattern() const; + + //- Clear the current selection + virtual void clearSelection(); + + //- Update the selection using current contents of obr_ + virtual bool updateSelection(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "fieldSelectionTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C b/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C new file mode 100644 index 0000000000..80c476a44e --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fieldSelectionTemplates.C @@ -0,0 +1,47 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "DynamicList.H" +#include "objectRegistry.H" + +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +template +void Foam::functionObjects::fieldSelection::addRegistered +( + wordHashSet& set +) const +{ + DynamicList names; + for (const wordRe& name : *this) + { + names.append(obr_.names(name)); + } + + set.insert(names); +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.C b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.C new file mode 100644 index 0000000000..9d55a55393 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.C @@ -0,0 +1,64 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "fileFieldSelection.H" +#include "objectRegistry.H" +#include "volMesh.H" +#include "fvPatchField.H" +#include "surfaceMesh.H" +#include "fvsPatchField.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::fileFieldSelection::fileFieldSelection +( + const objectRegistry& obr +) +: + fieldSelection(obr) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::functionObjects::fileFieldSelection::~fileFieldSelection() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::fileFieldSelection::updateSelection() +{ + wordHashSet oldSet; + oldSet.swap(selection_); + + addFileGeoFields(selection_); + addFileGeoFields(selection_); + + return selection_ != oldSet; +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H new file mode 100644 index 0000000000..d1d3a986c7 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelection.H @@ -0,0 +1,115 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::functionObjects::fileFieldSelection + +Description + Helper class to manage file-based field selections + +SourceFiles + fieldSelection.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjects_fileFieldSelection_H +#define functionObjects_fileFieldSelection_H + +#include "fieldSelection.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +class IOobjectList; + +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class fileFieldSelection Declaration +\*---------------------------------------------------------------------------*/ + +class fileFieldSelection +: + public fieldSelection +{ +private: + + // Private Member Functions + + //- Disallow default bitwise copy construct + fileFieldSelection(const fileFieldSelection&) = delete; + + +protected: + + // Protected Member Functions + + //- Add registered GeometricField types to selection + template class PatchType, class MeshType> + void addFileGeoFields(wordHashSet& set) const; + + //- Add objects of a given type + template + void addFromFile + ( + const IOobjectList& allFileObjects, + wordHashSet& set + ) const; + + +public: + + //- Construct from object registry + fileFieldSelection(const objectRegistry& obr); + + + //- Destructor + virtual ~fileFieldSelection(); + + + // Member Functions + + //- Update the selection + virtual bool updateSelection(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "fileFieldSelectionTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C new file mode 100644 index 0000000000..f915d04997 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/fileFieldSelectionTemplates.C @@ -0,0 +1,77 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "IOobjectList.H" +#include "GeometricField.H" +#include "fvMesh.H" +#include "DynamicList.H" + +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +template +void Foam::functionObjects::fileFieldSelection::addFromFile +( + const IOobjectList& allFileObjects, + wordHashSet& set +) const +{ + DynamicList names; + + for (const wordRe& fieldName : *this) + { + names.append(allFileObjects.names(Type::typeName, fieldName)); + } + + set.insert(names); +} + + +template class PatchType, class MeshType> +void Foam::functionObjects::fileFieldSelection::addFileGeoFields +( + wordHashSet& set +) const +{ + const fvMesh& mesh = static_cast(obr_); + + const IOobjectList allObjects(mesh, mesh.time().timeName()); + + addFromFile>(allObjects, set); + addFromFile>(allObjects, set); + addFromFile> + ( + allObjects, + set + ); + addFromFile> + ( + allObjects, + set + ); + addFromFile>(allObjects, set); +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.C b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.C new file mode 100644 index 0000000000..d7508642d2 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.C @@ -0,0 +1,81 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "solverFieldSelection.H" +#include "fvMesh.H" +#include "volMesh.H" +#include "fvPatchField.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::solverFieldSelection::solverFieldSelection +( + const objectRegistry& obr +) +: + volFieldSelection(obr) +{ + if (!isA(obr)) + { + FatalErrorInFunction + << "Registry must be of type " << fvMesh::typeName + << abort(FatalError); + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::functionObjects::solverFieldSelection::~solverFieldSelection() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::solverFieldSelection::updateSelection() +{ + wordHashSet oldSet; + oldSet.swap(selection_); + + wordHashSet volFields; + addRegisteredGeoFields(volFields); + + const fvMesh& mesh = static_cast(obr_); + + const Foam::dictionary& solverDict = mesh.solverPerformanceDict(); + + for (const word& fieldName : volFields) + { + if (solverDict.found(fieldName)) + { + selection_.insert(fieldName); + } + } + + return selection_ != oldSet; +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H new file mode 100644 index 0000000000..55d860a199 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/solverFieldSelection.H @@ -0,0 +1,89 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::functionObjects::volFieldSelection + +Description + Helper class to manage volume field selections + +SourceFiles + volFieldSelection.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjects_solverFieldSelection_H +#define functionObjects_solverFieldSelection_H + +#include "volFieldSelection.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class solverFieldSelection Declaration +\*---------------------------------------------------------------------------*/ + +class solverFieldSelection +: + public volFieldSelection +{ +private: + + // Private Member Functions + + //- Disallow default bitwise copy construct + solverFieldSelection(const solverFieldSelection&) = delete; + + +public: + + //- Construct from object registry + solverFieldSelection(const objectRegistry& obr); + + + //- Destructor + virtual ~solverFieldSelection(); + + + // Member Functions + + //- Update the selection using current contents of obr_ + virtual bool updateSelection(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.C b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.C new file mode 100644 index 0000000000..b0b61eb524 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.C @@ -0,0 +1,61 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "volFieldSelection.H" +#include "volMesh.H" +#include "fvPatchField.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::volFieldSelection::volFieldSelection +( + const objectRegistry& obr +) +: + fieldSelection(obr) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::functionObjects::volFieldSelection::~volFieldSelection() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::volFieldSelection::updateSelection() +{ + wordHashSet oldSet; + + oldSet.swap(selection_); + + addRegisteredGeoFields(selection_); + + return selection_ != oldSet; +} + + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H new file mode 100644 index 0000000000..cad0440bd7 --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelection.H @@ -0,0 +1,104 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::functionObjects::volFieldSelection + +Description + Helper class to manage volume field selections + +SourceFiles + volFieldSelection.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjects_volFieldSelection_H +#define functionObjects_volFieldSelection_H + +#include "fieldSelection.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class volFieldSelection Declaration +\*---------------------------------------------------------------------------*/ + +class volFieldSelection +: + public fieldSelection +{ +private: + + // Private Member Functions + + //- Disallow default bitwise copy construct + volFieldSelection(const volFieldSelection&) = delete; + + +protected: + + // Protected Member Functions + + //- Add registered GeometricField types to selection + template class PatchType, class MeshType> + void addRegisteredGeoFields(wordHashSet& set) const; + + +public: + + //- Construct from object registry + volFieldSelection(const objectRegistry& obr); + + + //- Destructor + virtual ~volFieldSelection(); + + + // Member Functions + + //- Update the selection using current contents of obr_ + virtual bool updateSelection(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "volFieldSelectionTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/finiteVolume/functionObjects/fieldSelection/volFieldSelectionTemplates.C b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelectionTemplates.C new file mode 100644 index 0000000000..f1e0ea195f --- /dev/null +++ b/src/finiteVolume/functionObjects/fieldSelection/volFieldSelectionTemplates.C @@ -0,0 +1,44 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "volFields.H" + +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +template class PatchType, class MeshType> +void Foam::functionObjects::volFieldSelection::addRegisteredGeoFields +( + wordHashSet& set +) const +{ + addRegistered>(set); + addRegistered>(set); + addRegistered>(set); + addRegistered>(set); + addRegistered>(set); +} + + +// ************************************************************************* // diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C index 296fb0d081..2c4ea97f34 100644 --- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C +++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -55,7 +55,7 @@ fieldCoordinateSystemTransform ) : fvMeshFunctionObject(name, runTime, dict), - fieldSet_(), + fieldSet_(mesh_), coordSys_(mesh_, dict.subDict("coordinateSystem")) { read(dict); @@ -90,23 +90,27 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::read const dictionary& dict ) { - fvMeshFunctionObject::read(dict); + if (fvMeshFunctionObject::read(dict)) + { + fieldSet_.read(dict); + return true; + } - dict.lookup("fields") >> fieldSet_; - - return true; + return false; } bool Foam::functionObjects::fieldCoordinateSystemTransform::execute() { - forAll(fieldSet_, fieldi) + fieldSet_.updateSelection(); + + for (const word& fieldName : fieldSet_.selection()) { - transform(fieldSet_[fieldi]); - transform(fieldSet_[fieldi]); - transform(fieldSet_[fieldi]); - transform(fieldSet_[fieldi]); - transform(fieldSet_[fieldi]); + transform(fieldName); + transform(fieldName); + transform(fieldName); + transform(fieldName); + transform(fieldName); } return true; @@ -115,9 +119,9 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::execute() bool Foam::functionObjects::fieldCoordinateSystemTransform::write() { - forAll(fieldSet_, fieldi) + forAllConstIters(fieldSet_, iter) { - writeObject(transformFieldName(fieldSet_[fieldi])); + writeObject(transformFieldName(iter())); } return true; diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H index f588d4f734..dbc0446cb7 100644 --- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H +++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H @@ -83,6 +83,7 @@ SourceFiles #include "fvMeshFunctionObject.H" #include "coordinateSystem.H" +#include "volFieldSelection.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -104,7 +105,7 @@ protected: // Protected data //- Fields to transform - wordList fieldSet_; + volFieldSelection fieldSet_; //- Co-ordinate system to transform to coordinateSystem coordSys_; diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/functionObjects/field/fieldMinMax/fieldMinMax.C index 35d68b92f0..5d3e3f0bfd 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.C +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.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-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -51,9 +51,22 @@ Foam::functionObjects::fieldMinMax::modeTypeNames_ // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void Foam::functionObjects::fieldMinMax::writeFileHeader(Ostream& os) const +void Foam::functionObjects::fieldMinMax::writeFileHeader(Ostream& os) { - writeHeader(os, "Field minima and maxima"); + if (!fieldSet_.updateSelection()) + { + return; + } + + if (writtenHeader_) + { + writeBreak(file()); + } + else + { + writeHeader(os, "Field minima and maxima"); + } + writeCommented(os, "Time"); if (location_) @@ -77,14 +90,17 @@ void Foam::functionObjects::fieldMinMax::writeFileHeader(Ostream& os) const } else { - forAll(fieldSet_, fieldi) + forAllConstIters(fieldSet_.selection(), iter) { - writeTabbed(os, "min(" + fieldSet_[fieldi] + ')'); - writeTabbed(os, "max(" + fieldSet_[fieldi] + ')'); + const word& fieldName = iter(); + writeTabbed(os, "min(" + fieldName + ')'); + writeTabbed(os, "max(" + fieldName + ')'); } } os << endl; + + writtenHeader_ = true; } @@ -101,10 +117,9 @@ Foam::functionObjects::fieldMinMax::fieldMinMax writeFile(mesh_, name, typeName, dict), location_(true), mode_(mdMag), - fieldSet_() + fieldSet_(mesh_) { read(dict); - writeFileHeader(file()); } @@ -124,7 +139,8 @@ bool Foam::functionObjects::fieldMinMax::read(const dictionary& dict) location_ = dict.lookupOrDefault("location", true); mode_ = modeTypeNames_.lookupOrDefault("mode", dict, modeType::mdMag); - dict.lookup("fields") >> fieldSet_; + + fieldSet_.read(dict); return true; } @@ -138,16 +154,18 @@ bool Foam::functionObjects::fieldMinMax::execute() bool Foam::functionObjects::fieldMinMax::write() { + writeFileHeader(file()); + if (!location_) writeTime(file()); Log << type() << " " << name() << " write:" << nl; - forAll(fieldSet_, fieldi) + for (const word& fieldName : fieldSet_.selection()) { - calcMinMaxFields(fieldSet_[fieldi], mdCmpt); - calcMinMaxFields(fieldSet_[fieldi], mode_); - calcMinMaxFields(fieldSet_[fieldi], mode_); - calcMinMaxFields(fieldSet_[fieldi], mode_); - calcMinMaxFields(fieldSet_[fieldi], mode_); + calcMinMaxFields(fieldName, mdCmpt); + calcMinMaxFields(fieldName, mode_); + calcMinMaxFields(fieldName, mode_); + calcMinMaxFields(fieldName, mode_); + calcMinMaxFields(fieldName, mode_); } if (!location_) file()<< endl; diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H index 588dc5c7fd..9f7cd954a8 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -82,6 +82,7 @@ SourceFiles #include "fvMeshFunctionObject.H" #include "writeFile.H" #include "vector.H" +#include "volFieldSelection.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -124,7 +125,7 @@ protected: modeType mode_; //- Fields to assess min/max - wordList fieldSet_; + volFieldSelection fieldSet_; // Protected Member Functions @@ -147,7 +148,7 @@ protected: //- Output file header information - virtual void writeFileHeader(Ostream& os) const; + virtual void writeFileHeader(Ostream& os); //- Disallow default bitwise copy construct fieldMinMax(const fieldMinMax&) = delete; diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.H b/src/functionObjects/field/nearWallFields/nearWallFields.H index 9a2850c20a..85c67d9b2d 100644 --- a/src/functionObjects/field/nearWallFields/nearWallFields.H +++ b/src/functionObjects/field/nearWallFields/nearWallFields.H @@ -107,7 +107,7 @@ protected: // Read from dictionary - //- Fields to process + //- Fields to process (input-name output-name) List> fieldSet_; //- Switch to send output to Info as well as to file diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C index 8ae33b507f..bf8a4a3856 100644 --- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C +++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C @@ -860,7 +860,7 @@ bool Foam::functionObjects::regionSizeDistribution::write() forAll(selected, i) { const word& fldName = scalarNames[selected[i]]; - Log << " Scalar field " << fldName << endl; + Log << " Scalar field " << fldName << endl; const scalarField& fld = obr_.lookupObject < diff --git a/src/functionObjects/utilities/residuals/residuals.C b/src/functionObjects/utilities/residuals/residuals.C index a9f41a02b1..0cdf2c6d97 100644 --- a/src/functionObjects/utilities/residuals/residuals.C +++ b/src/functionObjects/utilities/residuals/residuals.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -46,15 +46,26 @@ namespace functionObjects // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -void Foam::functionObjects::residuals::writeFileHeader(Ostream& os) const +void Foam::functionObjects::residuals::writeFileHeader(Ostream& os) { - writeHeader(os, "Residuals"); + if (!fieldSet_.updateSelection()) + { + return; + } + + if (writtenHeader_) + { + writeBreak(file()); + } + else + { + writeHeader(os, "Residuals"); + } + writeCommented(os, "Time"); - forAll(fieldSet_, fieldi) + for (const word& fieldName : fieldSet_.selection()) { - const word& fieldName = fieldSet_[fieldi]; - writeFileHeader(os, fieldName); writeFileHeader(os, fieldName); writeFileHeader(os, fieldName); @@ -63,6 +74,8 @@ void Foam::functionObjects::residuals::writeFileHeader(Ostream& os) const } os << endl; + + writtenHeader_ = true; } @@ -77,10 +90,9 @@ Foam::functionObjects::residuals::residuals : fvMeshFunctionObject(name, runTime, dict), writeFile(obr_, name, typeName, dict), - fieldSet_() + fieldSet_(mesh_) { read(dict); - writeFileHeader(file()); } @@ -94,13 +106,13 @@ Foam::functionObjects::residuals::~residuals() bool Foam::functionObjects::residuals::read(const dictionary& dict) { - fvMeshFunctionObject::read(dict); + if (fvMeshFunctionObject::read(dict)) + { + fieldSet_.read(dict); + return true; + } - wordList allFields(dict.lookup("fields")); - wordHashSet uniqueFields(allFields); - fieldSet_ = uniqueFields.toc(); - - return true; + return false; } @@ -114,12 +126,12 @@ bool Foam::functionObjects::residuals::write() { if (Pstream::master()) { + writeFileHeader(file()); + writeTime(file()); - forAll(fieldSet_, fieldi) + for (const word& fieldName : fieldSet_.selection()) { - const word& fieldName = fieldSet_[fieldi]; - writeResidual(fieldName); writeResidual(fieldName); writeResidual(fieldName); diff --git a/src/functionObjects/utilities/residuals/residuals.H b/src/functionObjects/utilities/residuals/residuals.H index 283e4738da..02e2db2843 100644 --- a/src/functionObjects/utilities/residuals/residuals.H +++ b/src/functionObjects/utilities/residuals/residuals.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -62,6 +62,7 @@ SourceFiles #include "fvMeshFunctionObject.H" #include "writeFile.H" +#include "solverFieldSelection.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -84,13 +85,13 @@ protected: // Protected data //- Fields to write residuals - wordList fieldSet_; + solverFieldSelection fieldSet_; // Protected Member Functions //- Output file header information - void writeFileHeader(Ostream& os) const; + void writeFileHeader(Ostream& os); //- Output file header information per primitive type value template