Permalink
Browse files

Standardized the selection of required and optional fields in BCs, fv…

…Options, functionObjects etc.

In most boundary conditions, fvOptions etc. required and optional fields
to be looked-up from the objectRegistry are selected by setting the
keyword corresponding to the standard field name in the BC etc. to the
appropriate name in the objectRegistry.  Usually a default is provided
with sets the field name to the keyword name, e.g. in the
totalPressureFvPatchScalarField the velocity is selected by setting the
keyword 'U' to the appropriate name which defaults to 'U':

        Property     | Description             | Required    | Default value
        U            | velocity field name     | no          | U
        phi          | flux field name         | no          | phi
        .
        .
        .

However, in some BCs and functionObjects and many fvOptions another
convention is used in which the field name keyword is appended by 'Name'
e.g.

        Property     | Description             | Required    | Default value
        pName        | pressure field name     | no          | p
        UName        | velocity field name     | no          | U

This difference in convention is unnecessary and confusing, hinders code
and dictionary reuse and complicates code maintenance.  In this commit
the appended 'Name' is removed from the field selection keywords
standardizing OpenFOAM on the first convention above.
  • Loading branch information...
Henry Weller
Henry Weller committed May 21, 2016
1 parent ddfbaa7 commit e22c65dd8e70d38fa6f6f8163dd8261d4fc75e20
Showing with 232 additions and 440 deletions.
  1. +3 −3 applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
  2. +1 −1 src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
  3. +2 −2 ...lume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
  4. +2 −2 src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
  5. +2 −2 ...lume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
  6. +10 −11 ...ields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
  7. +13 −13 ...ields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
  8. +1 −1 ...PatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
  9. +2 −2 ...ields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
  10. +2 −2 src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
  11. +2 −2 ...ds/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
  12. +1 −1 ...ds/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
  13. +2 −2 src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
  14. +3 −3 src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
  15. +2 −2 src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
  16. +1 −1 src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
  17. +3 −3 src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
  18. +2 −2 src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
  19. +1 −1 src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
  20. +1 −1 src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
  21. +4 −4 src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
  22. +5 −5 src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
  23. +3 −3 src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
  24. +1 −1 src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
  25. +4 −4 ...Options/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
  26. +4 −4 ...s/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
  27. +2 −2 ...Options/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
  28. +2 −2 ...fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
  29. +1 −1 src/lagrangian/basic/InteractionLists/InteractionLists.C
  30. +1 −1 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
  31. +1 −1 src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
  32. +3 −3 ...ermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
  33. +0 −3 src/postProcessing/functionObjects/field/streamLine/controlDict
  34. +2 −2 src/postProcessing/functionObjects/field/streamLine/streamLine.C
  35. +9 −10 src/postProcessing/functionObjects/field/streamLine/streamLine.H
  36. +1 −1 src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
  37. +2 −2 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
  38. +10 −10 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
  39. +4 −4 src/postProcessing/functionObjects/forces/forces/forces.C
  40. +11 −11 src/postProcessing/functionObjects/forces/forces/forces.H
  41. +3 −3 src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
  42. +2 −2 src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
  43. +3 −3 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
  44. +1 −1 src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
  45. +1 −1 ...els/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
  46. +2 −6 ...els/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
  47. +2 −2 src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
  48. +1 −1 src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
  49. +3 −3 ...atchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
  50. +1 −1 ...atchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
  51. +2 −2 src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
  52. +2 −2 src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
  53. +1 −1 src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
  54. +1 −1 src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
  55. +1 −1 ...e/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
  56. +0 −1 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.orig/U
  57. +0 −1 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
  58. +0 −4 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
  59. +0 −2 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
  60. +0 −2 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
  61. +1 −2 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
  62. +0 −3 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
  63. +0 −4 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
  64. +1 −1 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
  65. +1 −1 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
  66. +1 −2 tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
  67. +0 −4 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
  68. +0 −2 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
  69. +0 −2 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
  70. +1 −2 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
  71. +0 −3 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
  72. +2 −2 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
  73. +1 −2 tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
  74. +0 −1 tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
  75. +0 −1 tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
  76. +0 −1 tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
  77. +0 −1 tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
  78. +0 −1 tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
  79. +0 −2 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
  80. +0 −2 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
  81. +0 −2 tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
  82. +0 −2 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T
  83. +0 −4 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p
  84. +0 −2 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
  85. +0 −4 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
  86. +0 −2 tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
  87. +0 −4 tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
  88. +0 −1 tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
  89. +0 −2 tutorials/compressible/sonicDyMFoam/movingCone/0/p
  90. +0 −2 tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
  91. +0 −2 tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
  92. +0 −2 tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
  93. +0 −2 tutorials/compressible/sonicFoam/ras/prism/0/p
  94. +2 −4 tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
  95. +3 −5 ...er/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
  96. +0 −4 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
  97. +0 −1 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
  98. +0 −1 tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
  99. +3 −6 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
  100. +1 −2 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
  101. +2 −4 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
  102. +2 −4 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
  103. +1 −2 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
  104. +1 −2 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
  105. +1 −2 ...als/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
  106. +1 −2 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
  107. +1 −2 ...als/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
  108. +1 −2 ...ls/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
  109. +1 −2 tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
  110. +2 −2 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
  111. +2 −2 tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
  112. +1 −6 ...ransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
  113. +3 −6 ...atTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
  114. +3 −6 ...ransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
  115. +3 −6 ...ansfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
  116. +1 −6 ...atTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
  117. +0 −2 tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
  118. +1 −3 tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
  119. +1 −1 ...rials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
  120. +3 −5 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
  121. +0 −2 tutorials/incompressible/pimpleFoam/TJunction/0/p
  122. +0 −2 tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon
  123. +1 −1 tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
  124. +1 −4 tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
  125. +1 −3 tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
  126. +0 −3 tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
  127. +4 −4 tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
  128. +0 −3 tutorials/incompressible/simpleFoam/motorBike/system/streamLines
  129. +1 −1 tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
  130. +0 −3 tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
  131. +0 −3 tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
  132. +1 −1 tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
  133. +2 −2 tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
  134. +1 −1 tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
  135. +0 −3 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
  136. +1 −1 tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/T
  137. +1 −1 tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/U
  138. +2 −2 tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
  139. +1 −1 tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
  140. +0 −2 tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
  141. +0 −2 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
  142. +0 −2 tutorials/lagrangian/reactingParcelFoam/filter/0/G
  143. +0 −2 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
  144. +1 −1 tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
  145. +0 −1 tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
  146. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
  147. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
  148. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
  149. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
  150. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
  151. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
  152. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
  153. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
  154. +1 −1 tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
  155. +0 −1 tutorials/multiphase/cavitatingFoam/les/throttle/0/p
  156. +0 −1 tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p
  157. +0 −1 tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
  158. +0 −2 tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
  159. +0 −2 tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh
  160. +0 −2 tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
  161. +0 −2 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh
  162. +0 −2 tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh
  163. +0 −1 tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U
  164. +0 −2 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
  165. +0 −2 tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
  166. +0 −2 tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh
  167. +0 −2 tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
  168. +0 −2 tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
  169. +0 −2 tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
  170. +0 −1 tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U
  171. +0 −2 tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh
  172. +0 −2 tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
  173. +0 −2 tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
  174. +0 −1 tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
  175. +0 −2 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
  176. +0 −2 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
  177. +0 −2 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
  178. +1 −3 tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
  179. +2 −4 tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
  180. +1 −1 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
  181. +1 −1 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
@@ -47,9 +47,9 @@ Description
\heading Patch usage
\table
Property | Description | Required | Default value
pName | Pressure field name | no | p
psiName | Compressibility field name | no | thermo:psi
Property | Description | Required | Default value
p | Pressure field name | no | p
psi | Compressibility field name | no | thermo:psi
\endtable
Example of the boundary condition specification:
@@ -77,7 +77,7 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
),
pointIDs_(),
moveAllCells_(false),
UName_(dynamicMeshCoeffs_.lookupOrDefault<word>("UName", "U"))
UName_(dynamicMeshCoeffs_.lookupOrDefault<word>("U", "U"))
{
if (undisplacedPoints_.size() != nPoints())
{
@@ -34,8 +34,8 @@ Description
For a mass-based flux:
- the flow rate should be provided in kg/s
- if \c rhoName is "none" the flow rate is in m3/s
- otherwise \c rhoName should correspond to the name of the density field
- if \c rho is "none" the flow rate is in m3/s
- otherwise \c rho should correspond to the name of the density field
- if the density field cannot be found in the database, the user must
specify the inlet density using the \c rhoInlet entry
@@ -68,7 +68,7 @@ mappedPatchFieldBase<Type>::mappedPatchFieldBase
(
dict.template lookupOrDefault<word>
(
"fieldName",
"field",
patchField_.internalField().name()
)
),
@@ -314,7 +314,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
template<class Type>
void mappedPatchFieldBase<Type>::write(Ostream& os) const
{
os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("field") << fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
os.writeKeyword("interpolationScheme") << interpolationScheme_
@@ -69,7 +69,7 @@ outletMappedUniformInletFvPatchField
)
:
fixedValueFvPatchField<Type>(p, iF, dict),
outletPatchName_(dict.lookup("outletPatchName")),
outletPatchName_(dict.lookup("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi"))
{}
@@ -168,7 +168,7 @@ template<class Type>
void Foam::outletMappedUniformInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
os.writeKeyword("outletPatchName")
os.writeKeyword("outletPatch")
<< outletPatchName_ << token::END_STATEMENT << nl;
if (phiName_ != "phi")
{
@@ -40,7 +40,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
phaseName_("alpha"),
phaseFraction_("alpha"),
rho_(0.0),
pRefValue_(0.0),
pRefPoint_(Zero)
@@ -60,7 +60,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
phaseName_(dict.lookupOrDefault<word>("phaseName", "alpha")),
phaseFraction_(dict.lookupOrDefault<word>("phaseFraction", "alpha")),
rho_(readScalar(dict.lookup("rho"))),
pRefValue_(readScalar(dict.lookup("pRefValue"))),
pRefPoint_(dict.lookup("pRefPoint"))
@@ -94,7 +94,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
phaseName_(ptf.phaseName_),
phaseFraction_(ptf.phaseFraction_),
rho_(ptf.rho_),
pRefValue_(ptf.pRefValue_),
pRefPoint_(ptf.pRefPoint_)
@@ -108,7 +108,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf),
phaseName_(ptf.phaseName_)
phaseFraction_(ptf.phaseFraction_)
{}
@@ -120,7 +120,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, iF),
phaseName_(ptf.phaseName_),
phaseFraction_(ptf.phaseFraction_),
rho_(ptf.rho_),
pRefValue_(ptf.pRefValue_),
pRefPoint_(ptf.pRefPoint_)
@@ -139,7 +139,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
const scalarField& alphap =
patch().lookupPatchField<volScalarField, scalar>
(
phaseName_
phaseFraction_
);
const uniformDimensionedVectorField& g =
@@ -161,10 +161,10 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
void Foam::phaseHydrostaticPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
if (phaseName_ != "alpha")
if (phaseFraction_ != "alpha")
{
os.writeKeyword("phaseName")
<< phaseName_ << token::END_STATEMENT << nl;
os.writeKeyword("phaseFraction")
<< phaseFraction_ << token::END_STATEMENT << nl;
}
os.writeKeyword("rho") << rho_ << token::END_STATEMENT << nl;
os.writeKeyword("pRefValue") << pRefValue_ << token::END_STATEMENT << nl;
@@ -182,8 +182,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::operator=
{
fvPatchScalarField::operator=
(
valueFraction()*refValue()
+ (1 - valueFraction())*ptf
valueFraction()*refValue() + (1 - valueFraction())*ptf
);
}
@@ -51,19 +51,19 @@ Description
\heading Patch usage
\table
Property | Description | Required | Default value
phaseName | phase field name | no | alpha
rho | density field name | no | rho
pRefValue | reference pressure [Pa] | yes |
pRefPoint | reference pressure location | yes |
Property | Description | Required | Default value
phaseFraction | phase-fraction field name | no | alpha
rho | density field name | no | rho
pRefValue | reference pressure [Pa] | yes |
pRefPoint | reference pressure location | yes |
\endtable
Example of the boundary condition specification:
\verbatim
myPatch
{
type phaseHydrostaticPressure;
phaseName alpha1;
phaseFraction alpha1;
rho rho;
pRefValue 1e5;
pRefPoint (0 0 0);
@@ -103,7 +103,7 @@ protected:
// Protected data
//- Name of phase-fraction field
word phaseName_;
word phaseFraction_;
//- Constant density in the far-field
scalar rho_;
@@ -196,16 +196,16 @@ public:
// Access
//- Return the phaseName
const word& phaseName() const
//- Return the phaseFraction
const word& phaseFraction() const
{
return phaseName_;
return phaseFraction_;
}
//- Return reference to the phaseName to allow adjustment
word& phaseName()
//- Return reference to the phaseFraction to allow adjustment
word& phaseFraction()
{
return phaseName_;
return phaseFraction_;
}
//- Return the constant density in the far-field
@@ -149,7 +149,7 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::write
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
writeEntryIfDifferent<word>(os, "ph_rghName", "ph_rghName", ph_rghName_);
writeEntryIfDifferent<word>(os, "ph_rgh", "ph_rgh", ph_rghName_);
writeEntry("value", os);
}
@@ -98,7 +98,7 @@ timeVaryingMappedFixedValueFvPatchField
}
dict.readIfPresent("fieldTableName", fieldTableName_);
dict.readIfPresent("fieldTable", fieldTableName_);
if (dict.found("value"))
{
@@ -565,7 +565,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
if (fieldTableName_ != this->internalField().name())
{
os.writeKeyword("fieldTableName") << fieldTableName_
os.writeKeyword("fieldTable") << fieldTableName_
<< token::END_STATEMENT << nl;
}
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
Foam::word Foam::fv::localEulerDdt::rDeltaTName("rDeltaT");
Foam::word Foam::fv::localEulerDdt::rSubDeltaTName("rSubDeltaTName");
Foam::word Foam::fv::localEulerDdt::rSubDeltaTName("rSubDeltaT");
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,7 +59,7 @@ uniformInterpolatedDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF, dict),
fieldName_(dict.lookup("fieldName")),
fieldName_(dict.lookup("field")),
interpolationScheme_(dict.lookup("interpolationScheme"))
{
const pointMesh& pMesh = this->internalField().mesh();
@@ -260,7 +260,7 @@ void uniformInterpolatedDisplacementPointPatchVectorField::write(Ostream& os)
const
{
pointPatchField<vector>::write(os);
os.writeKeyword("fieldName")
os.writeKeyword("field")
<< fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("interpolationScheme")
<< interpolationScheme_ << token::END_STATEMENT << nl;
@@ -37,7 +37,7 @@ Description
{
type uniformInterpolatedDisplacement;
value uniform (0 0 0);
fieldName wantedDisplacement;
field wantedDisplacement;
interpolationScheme linear;
}
\endverbatim
@@ -84,7 +84,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
}
case tmLookup:
{
TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
TName_ = coeffs_.lookupOrDefault<word>("T", "T");
break;
}
default:
@@ -157,7 +157,7 @@ bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
);
}
coeffs_.readIfPresent("TName", TName_);
coeffs_.readIfPresent("T", TName_);
return true;
}
@@ -33,11 +33,11 @@ Description
{
mode uniform; // uniform or lookup
// uniform option
// For uniform option
temperature constant 500; // fixed temperature with time [K]
// lookup option
// TName T; // optional temperature field name
// For lookup option
// T <Tname>; // optional temperature field name
}
Note:
@@ -56,9 +56,9 @@ Foam::fv::buoyancyEnergy::buoyancyEnergy
)
:
option(sourceName, modelType, dict, mesh),
UName_(coeffs_.lookupOrDefault<word>("UName", "U"))
UName_(coeffs_.lookupOrDefault<word>("U", "U"))
{
coeffs_.lookup("fieldNames") >> fieldNames_;
coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
@@ -68,7 +68,7 @@ Foam::fv::buoyancyForce::buoyancyForce
)
)
{
coeffs_.lookup("fieldNames") >> fieldNames_;
coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
@@ -156,9 +156,9 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
secondaryInletT_(readScalar(coeffs_.lookup("secondaryInletT"))),
primaryInletT_(readScalar(coeffs_.lookup("primaryInletT"))),
eTable_(),
UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
TName_(coeffs_.lookupOrDefault<word>("TName", "T")),
phiName_(coeffs_.lookupOrDefault<word>("phiName", "phi")),
UName_(coeffs_.lookupOrDefault<word>("U", "U")),
TName_(coeffs_.lookupOrDefault<word>("T", "T")),
phiName_(coeffs_.lookupOrDefault<word>("phi", "phi")),
faceZoneName_(coeffs_.lookup("faceZone")),
zoneID_(mesh_.faceZones().findZoneID(faceZoneName_)),
faceId_(),
@@ -130,9 +130,9 @@ bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
{
coeffs_.lookup("UNames") >> fieldNames_;
}
else if (coeffs_.found("UName"))
else if (coeffs_.found("U"))
{
word UName(coeffs_.lookup("UName"));
word UName(coeffs_.lookup("U"));
fieldNames_ = wordList(1, UName);
}
else
@@ -93,7 +93,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
relaxation_(coeffs_.lookupOrDefault<scalar>("relaxation", 1.0)),
rAPtr_(NULL)
{
coeffs_.lookup("fieldNames") >> fieldNames_;
coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
@@ -586,7 +586,7 @@ bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
coeffs_.lookup("fieldNames") >> fieldNames_;
coeffs_.lookup("fields") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false);
// Read co-ordinate system/geometry invariant properties
@@ -193,10 +193,10 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
relax_(coeffs_.lookupOrDefault("relax", 0.9)),
mode_(thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"))),
rhoRef_(readScalar(coeffs_.lookup("rhoRef"))),
TName_(coeffs_.lookupOrDefault<word>("TName", "T")),
CpName_(coeffs_.lookupOrDefault<word>("CpName", "Cp")),
UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
phiName_(coeffs_.lookupOrDefault<word>("phiName", "phi")),
TName_(coeffs_.lookupOrDefault<word>("T", "T")),
CpName_(coeffs_.lookupOrDefault<word>("Cp", "Cp")),
UName_(coeffs_.lookupOrDefault<word>("U", "U")),
phiName_(coeffs_.lookupOrDefault<word>("phi", "phi")),
Cu_(coeffs_.lookupOrDefault<scalar>("Cu", 100000)),
q_(coeffs_.lookupOrDefault("q", 0.001)),
beta_(readScalar(coeffs_.lookup("beta"))),
Oops, something went wrong.

0 comments on commit e22c65d

Please sign in to comment.