From 3e43edf0566313830f08f8122cb1efbf9c753fee Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 2 Jun 2020 16:38:55 +0200 Subject: [PATCH] ENH: unify use of dictionary method names - previously introduced `getOrDefault` as a dictionary _get_ method, now complete the transition and use it everywhere instead of `lookupOrDefault`. This avoids mixed usage of the two methods that are identical in behaviour, makes for shorter names, and promotes the distinction between "lookup" access (ie, return a token stream, locate and return an entry) and "get" access (ie, the above with conversion to concrete types such as scalar, label etc). --- .../basic/potentialFoam/createControls.H | 2 +- .../overPotentialFoam/createControls.H | 2 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 4 +- .../XiFoam/XiDyMFoam/createControls.H | 4 +- .../XiFoam/XiDyMFoam/readControls.H | 4 +- .../fireFoam/createRegionControls.H | 4 +- .../solvers/combustion/fireFoam/phrghEqn.H | 4 +- .../combustion/reactingFoam/setRDeltaT.H | 11 ++-- .../T/smoluchowskiJumpTFvPatchScalarField.C | 11 ++-- .../BCs/U/maxwellSlipUFvPatchVectorField.C | 15 ++--- .../BCs/rho/fixedRhoFvPatchScalarField.C | 5 +- .../compressible/rhoCentralFoam/setRDeltaT.H | 2 +- .../rhoPimpleAdiabaticFoam/EEqn.H | 2 +- .../overRhoPimpleDyMFoam/createControls.H | 2 +- .../overRhoPimpleDyMFoam/readControls.H | 6 +- .../compressible/rhoPimpleFoam/setRDeltaT.H | 8 +-- .../overRhoSimpleFoam/createFields.H | 2 +- .../mhdFoam/readBPISOControls.H | 2 +- .../overBuoyantPimpleDyMFoam/readControls.H | 6 +- .../readFluidMultiRegionSIMPLEControls.H | 4 +- .../readSolidMultiRegionSIMPLEControls.H | 2 +- ...woPhaseRadCoupledMixedFvPatchScalarField.C | 8 +-- .../readFluidMultiRegionPIMPLEControls.H | 4 +- .../readFluidMultiRegionPIMPLEControls.H | 6 +- .../chtMultiRegionFoam/readPIMPLEControls.H | 2 +- .../readSolidMultiRegionPIMPLEControls.H | 2 +- .../solid/readSolidTimeControls.H | 3 +- .../overPimpleDyMFoam/createControls.H | 10 ++-- .../overPimpleDyMFoam/readControls.H | 8 +-- .../overSimpleFoam/createOversetFields.H | 4 +- .../porousSimpleFoam/setPorosityTreatment.H | 2 +- .../lagrangian/coalChemistryFoam/setRDeltaT.H | 9 +-- .../reactingParcelFoam/createRegionControls.H | 2 +- .../reactingParcelFoam/setRDeltaT.H | 9 +-- .../solvers/multiphase/VoF/setRDeltaT.H | 20 +++---- .../cavitatingDyMFoam/readControls.H | 2 +- .../VoFPatchTransfer/VoFPatchTransfer.C | 10 ++-- .../VoFSolidificationMeltingSource.C | 7 ++- .../multiphase/driftFluxFoam/alphaControls.H | 4 +- ...incompressibleTwoPhaseInteractingMixture.C | 10 ++-- .../mixtureViscosityModels/plastic/plastic.C | 3 +- .../mixtureViscosityModels/slurry/slurry.C | 3 +- .../alphaCourantNo.H | 5 +- .../laserDTRM/laserDTRM.C | 8 +-- .../massTransferModels/Lee/Lee.C | 4 +- .../interfaceCompositionModel.C | 6 +- .../interfaceHeatResistance.C | 4 +- .../kineticGasEvaporation.C | 2 +- .../MultiComponentPhaseModel.C | 2 +- .../phasesSystem/phaseSystem/phaseSystem.C | 2 +- .../overInterDyMFoam/createDyMControls.H | 12 ++-- .../interFoam/overInterDyMFoam/readControls.H | 12 ++-- .../interPhaseChangeFoam/alphaControls.H | 6 +- .../multiphaseEulerFoam/multiphaseEulerFoam.C | 3 +- .../sizeDistribution/sizeDistribution.C | 8 +-- .../reactingMultiphaseEulerFoam.C | 7 ++- .../reactingMultiphaseEulerFoam/setRDeltaT.H | 6 +- .../reactingTwoPhaseEulerFoam.C | 5 +- .../reactingTwoPhaseEulerFoam/setRDeltaT.H | 6 +- .../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 5 +- .../twoPhaseSystem/phaseModel/phaseModel.C | 3 +- .../solidDisplacementFoam/createControls.H | 2 +- .../readSolidDisplacementFoamControls.H | 2 +- .../test/PatchFunction1/MappedField.C | 10 ++-- .../extrude/extrudeMesh/extrudeMesh.C | 2 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 4 +- .../cellSizeAndAlignmentGrid.C | 3 +- .../cv2DControls/cv2DControls.C | 5 +- .../backgroundMeshDecomposition.C | 4 +- .../cellAspectRatioControl.C | 5 +- .../cellSizeAndAlignmentControl.C | 4 +- .../searchableSurfaceControl.C | 3 +- .../fieldFromFile/fieldFromFile.C | 3 +- .../surfaceCellSizeFunction.C | 4 +- .../conformalVoronoiMesh.C | 3 +- .../conformalVoronoiMeshCalcDualMesh.C | 6 +- .../conformationSurfaces.C | 9 +-- .../cvControls/cvControls.C | 11 ++-- .../autoDensity/autoDensity.C | 6 +- .../searchableBoxFeatures.C | 3 +- .../searchablePlateFeatures.C | 3 +- .../triSurfaceMeshFeatures.C | 4 +- .../foamyMesh/foamyHexMesh/foamyHexMesh.C | 2 +- .../foamyHexMeshBackgroundMesh.C | 2 +- .../foamyHexMeshSurfaceSimplify.C | 2 +- .../foamyHexMeshSurfaceSimplify_non_octree.C | 2 +- .../generation/foamyMesh/foamyQuadMesh/CV2D.C | 3 +- .../foamyQuadMesh/shortEdgeFilter2D.C | 3 +- .../generation/snappyHexMesh/snappyHexMesh.C | 18 +++--- .../createBaffles/createBaffles.C | 6 +- .../faceSelection/faceSelection.C | 4 +- .../searchableSurfaceSelection.C | 3 +- .../moveDynamicMesh/moveDynamicMesh.C | 4 +- .../manipulation/renumberMesh/renumberMesh.C | 6 +- .../lagrangian/particleTracks/createFields.H | 2 +- .../setAlphaField/setAlphaField.C | 4 +- .../preProcessing/viewFactorsGen/shootRays.H | 2 +- .../viewFactorsGen/viewFactorsGen.C | 8 +-- .../surfaceFeatureExtract.C | 20 +++---- .../surface/surfacePatch/surfacePatch.C | 2 +- etc/codeTemplates/BC/BC.C | 2 +- .../functionObject/FUNCTIONOBJECT.C | 2 +- src/ODE/ODESolvers/ODESolver/ODESolver.C | 8 +-- .../adaptiveSolver/adaptiveSolver.C | 11 ++-- .../algorithms/indexedOctree/volumeType.C | 4 +- .../algorithms/indexedOctree/volumeType.H | 4 +- src/OpenFOAM/db/Time/Time.C | 8 +-- src/OpenFOAM/db/dictionary/dictionary.H | 12 ++-- .../functionEntries/inputMode/inputMode.C | 4 +- .../functionObject/functionObject.C | 4 +- .../functionObjectList/functionObjectList.C | 2 +- .../regionFunctionObject.C | 10 ++-- .../stateFunctionObject/stateFunctionObject.C | 6 +- .../db/functionObjects/writeFile/writeFile.C | 8 +-- .../expressions/exprDriver/exprDriver.C | 14 ++--- .../GeometricField/GeometricField.C | 4 +- .../pointPatchField/pointPatchField.C | 3 +- .../global/constants/dimensionedConstants.H | 3 +- .../fileOperation/fileOperation.C | 2 +- src/OpenFOAM/global/profiling/profiling.C | 6 +- .../interpolation2DTable.C | 2 +- .../interpolationTable/interpolationTable.C | 2 +- .../tableReaders/tableReader.C | 4 +- .../uniformInterpolationTable.C | 5 +- .../lduMatrix/lduMatrix/lduMatrixSolver.C | 10 ++-- .../GAMGPreconditioner/GAMGPreconditioner.C | 4 +- .../GAMGAgglomeration/GAMGAgglomeration.C | 10 ++-- .../pairGAMGAgglomeration.C | 3 +- .../eagerGAMGProcAgglomeration.C | 3 +- .../solvers/smoothSolver/smoothSolver.C | 4 +- src/OpenFOAM/matrices/solution/solution.C | 8 +-- .../basic/coupled/coupledPolyPatch.C | 5 +- .../constraint/cyclic/cyclicPolyPatch.C | 4 +- .../processorCyclicPolyPatch.C | 2 +- src/OpenFOAM/orientedType/orientedType.C | 4 +- .../functions/Function1/Sine/Sine.C | 4 +- .../primitives/subModelBase/subModelBase.C | 4 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.C | 4 +- ...tletMachNumberPressureFvPatchScalarField.C | 16 +++--- ...ppedUniformInletHeatAdditionFvPatchField.C | 8 +-- .../temperatureCoupledBase.C | 8 +-- .../thermalBaffle1DFvPatchScalarField.C | 7 ++- ...RateAdvectiveDiffusiveFvPatchScalarField.C | 8 +-- ...eratureRadCoupledMixedFvPatchScalarField.C | 8 +-- ...ayatillekeWallFunctionFvPatchScalarField.C | 8 +-- .../alphatWallFunctionFvPatchScalarField.C | 3 +- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 10 ++-- .../RAS/LienCubicKE/LienCubicKE.C | 36 ++++++------ .../RAS/LienLeschziner/LienLeschziner.C | 20 +++---- .../RAS/ShihQuadraticKE/ShihQuadraticKE.C | 22 ++++---- .../RAS/kkLOmega/kkLOmega.C | 56 +++++++++---------- .../RAS/qZeta/qZeta.C | 12 ++-- ...ayatillekeWallFunctionFvPatchScalarField.C | 6 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 8 +-- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 4 +- .../LES/continuousGasKEqn/continuousGasKEqn.C | 4 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 10 ++-- .../continuousGasKEpsilon.C | 4 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 4 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 15 ++--- .../Base/kOmegaSST/kOmegaSSTBase.C | 32 +++++------ .../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 6 +- .../SpalartAllmarasDES/SpalartAllmarasDES.C | 30 +++++----- .../SpalartAllmarasIDDES.C | 10 ++-- .../DES/kOmegaSSTDDES/kOmegaSSTDDES.C | 6 +- .../DES/kOmegaSSTDES/kOmegaSSTDES.C | 8 +-- .../DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C | 10 ++-- .../DeardorffDiffStress/DeardorffDiffStress.C | 8 +-- .../turbulenceModels/LES/LESModel/LESModel.C | 10 ++-- .../LES/LESdeltas/IDDESDelta/IDDESDelta.C | 4 +- .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.C | 5 +- .../cubeRootVolDelta/cubeRootVolDelta.C | 4 +- .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C | 4 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.C | 9 +-- .../LES/LESeddyViscosity/LESeddyViscosity.C | 2 +- .../LES/Smagorinsky/Smagorinsky.C | 2 +- .../turbulenceModels/LES/WALE/WALE.C | 4 +- .../LES/dynamicLagrangian/dynamicLagrangian.C | 4 +- .../turbulenceModels/LES/kEqn/kEqn.C | 2 +- .../turbulenceModels/RAS/LRR/LRR.C | 24 ++++---- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 14 ++--- .../turbulenceModels/RAS/RASModel/RASModel.C | 10 ++-- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 18 +++--- .../turbulenceModels/RAS/SSG/SSG.C | 26 ++++----- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 16 +++--- ...thDissipationRateInletFvPatchScalarField.C | 7 ++- ...ngLengthFrequencyInletFvPatchScalarField.C | 7 ++- .../turbulenceModels/RAS/kEpsilon/kEpsilon.C | 14 ++--- .../turbulenceModels/RAS/kOmega/kOmega.C | 12 ++-- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 18 +++--- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 12 ++-- .../RAS/realizableKE/realizableKE.C | 10 ++-- .../ReynoldsStress/ReynoldsStress.C | 3 +- .../fixedShearStressFvPatchVectorField.C | 3 +- .../porousBafflePressureFvPatchField.C | 7 ++- ...utUBlendedWallFunctionFvPatchScalarField.C | 4 +- .../nutURoughWallFunctionFvPatchScalarField.C | 6 +- ...tUSpaldingWallFunctionFvPatchScalarField.C | 6 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../laminar/laminarModel/laminarModel.C | 2 +- .../atmBoundaryLayer/atmBoundaryLayer.C | 6 +- ...ndaryLayerInletEpsilonFvPatchScalarField.C | 3 +- ...atmBoundaryLayerInletKFvPatchScalarField.C | 3 +- ...daryLayerInletVelocityFvPatchVectorField.C | 3 +- .../kEpsilonLopesdaCosta.C | 12 ++-- .../powerLawLopesdaCosta.C | 2 +- src/combustionModels/EDC/EDC.C | 30 +++++----- .../combustionModel/combustionModel.C | 3 +- src/combustionModels/diffusion/diffusion.C | 4 +- src/combustionModels/laminar/laminar.C | 6 +- src/conversion/ccm/reader/ccmReaderAux.C | 4 +- src/conversion/common/tables/boundaryRegion.C | 10 ++-- src/conversion/common/tables/cellTable.C | 14 ++--- .../freeSurfaceVelocityFvPatchVectorField.C | 3 +- .../interfaceTrackingFvMesh.C | 13 +++-- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 2 +- src/dynamicFvMesh/include/createDyMControls.H | 6 +- src/dynamicFvMesh/include/readDyMControls.H | 6 +- .../layerAdditionRemoval.C | 2 +- .../motionSmoother/motionSmootherAlgoCheck.C | 3 +- .../displacement/displacement/zoneMotion.C | 5 +- .../drivenLinearMotion/drivenLinearMotion.C | 4 +- .../solidBody/solidBodyMotionSolver.C | 5 +- .../polyMeshFilter/polyMeshFilterSettings.C | 27 +++------ .../polyTopoChange/edgeCollapser.C | 8 +-- .../slidingInterface/slidingInterface.C | 16 +++--- .../inletOutlet/inletOutletFaPatchField.C | 3 +- .../faPatchFields/faPatchField/faPatchField.C | 3 +- .../cfdTools/general/MRF/MRFZone.C | 6 +- .../SRFFreestreamVelocityFvPatchVectorField.C | 4 +- .../general/coupling/externalFileCoupler.C | 12 ++-- .../cfdTools/general/fvOptions/fvOption.C | 4 +- .../cfdTools/general/include/alphaControls.H | 8 +-- .../general/include/createTimeControls.H | 7 ++- .../general/include/readTimeControls.H | 7 ++- .../DarcyForchheimer/DarcyForchheimer.C | 8 +-- .../general/porosityModel/powerLaw/powerLaw.C | 3 +- .../solidification/solidification.C | 7 ++- .../solutionControl/loopControl/loopControl.C | 6 +- .../pimpleControl/pimpleControl.C | 12 ++-- .../solutionControl/solutionControl.C | 11 ++-- .../expressions/base/fvExprDriver.C | 8 +-- .../fields/base/patchExprFieldBase.C | 2 +- .../activeBaffleVelocityFvPatchVectorField.C | 3 +- ...ureForceBaffleVelocityFvPatchVectorField.C | 4 +- .../derived/advective/advectiveFvPatchField.C | 5 +- .../derived/fan/fanFvPatchField.C | 10 ++-- .../derived/fan/fanFvPatchFields.C | 10 ++-- .../fanPressureFvPatchScalarField.C | 4 +- .../fixedFluxPressureFvPatchScalarField.C | 4 +- .../derived/fixedMean/fixedMeanFvPatchField.C | 4 +- .../fixedMeanOutletInletFvPatchField.C | 3 +- ...malInletOutletVelocityFvPatchVectorField.C | 6 +- .../fixedNormalSlipFvPatchField.C | 4 +- ...ureCompressibleDensityFvPatchScalarField.C | 4 +- .../flowRateInletVelocityFvPatchVectorField.C | 8 +-- ...flowRateOutletVelocityFvPatchVectorField.C | 5 +- .../fluxCorrectedVelocityFvPatchVectorField.C | 8 +-- .../freestream/freestreamFvPatchField.C | 6 +- .../freestreamPressureFvPatchScalarField.C | 3 +- .../inletOutlet/inletOutletFvPatchField.C | 6 +- ...OutletTotalTemperatureFvPatchScalarField.C | 10 ++-- ...erstitialInletVelocityFvPatchVectorField.C | 3 +- .../derived/mappedField/Sampled/Sampled.C | 4 +- .../mappedField/mappedPatchFieldBase.C | 6 +- .../mappedFlowRateFvPatchVectorField.C | 7 ++- ...mappedVelocityFluxFixedValueFvPatchField.C | 3 +- ...FlowRateOutletVelocityFvPatchVectorField.C | 5 +- .../derived/noSlip/noSlipFvPatchVectorField.C | 4 +- .../outletInlet/outletInletFvPatchField.C | 6 +- .../outletMappedUniformInletFvPatchField.C | 3 +- ...utletPhaseMeanVelocityFvPatchVectorField.C | 4 +- .../partialSlip/partialSlipFvPatchField.C | 4 +- ...aseHydrostaticPressureFvPatchScalarField.C | 6 +- .../plenumPressureFvPatchScalarField.C | 7 ++- ...tedInletOutletVelocityFvPatchVectorField.C | 8 +-- ...eDirectedInletVelocityFvPatchVectorField.C | 5 +- ...tOutletParSlipVelocityFvPatchVectorField.C | 8 +-- ...ureInletOutletVelocityFvPatchVectorField.C | 6 +- .../pressureInletVelocityFvPatchVectorField.C | 5 +- ...malInletOutletVelocityFvPatchVectorField.C | 8 +-- ...IDControlInletVelocityFvPatchVectorField.C | 14 ++--- .../prghPressureFvPatchScalarField.C | 4 +- ...talHydrostaticPressureFvPatchScalarField.C | 9 +-- .../prghTotalPressureFvPatchScalarField.C | 8 +-- ...ureInletOutletVelocityFvPatchVectorField.C | 4 +- .../supersonicFreestreamFvPatchVectorField.C | 10 ++-- .../swirlFanVelocityFvPatchField.C | 20 +++---- ...lFlowRateInletVelocityFvPatchVectorField.C | 10 ++-- .../syringePressureFvPatchScalarField.C | 3 +- .../totalPressureFvPatchScalarField.C | 9 +-- .../totalTemperatureFvPatchScalarField.C | 7 ++- .../turbulentDFSEMInletFvPatchVectorField.C | 10 ++-- ...sityKineticEnergyInletFvPatchScalarField.C | 8 +-- .../uniformFixedGradientFvPatchField.C | 4 +- .../uniformInletOutletFvPatchField.C | 6 +- .../uniformTotalPressureFvPatchScalarField.C | 9 +-- .../variableHeightFlowRateFvPatchField.C | 6 +- .../waveSurfacePressureFvPatchScalarField.C | 8 +-- .../waveTransmissiveFvPatchField.C | 3 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 4 +- .../functionObjects/volRegion/volRegion.C | 4 +- .../fvMatrices/fvMatrix/fvMatrix.C | 4 +- .../fvMatrices/fvMatrix/fvMatrixSolve.C | 4 +- .../solvers/MULES/CMULESTemplates.C | 8 +-- .../fvMatrices/solvers/MULES/MULESTemplates.C | 9 +-- .../isoAdvection/isoAdvection/isoAdvection.C | 20 +++---- .../advectionDiffusionPatchDistMethod.C | 8 +-- .../meshWave/meshWavePatchDistMethod.C | 3 +- .../fvMesh/wallDist/wallDist/wallDist.C | 10 ++-- .../field/CourantNo/CourantNo.C | 3 +- src/functionObjects/field/PecletNo/PecletNo.C | 4 +- .../field/blendingFactor/blendingFactor.C | 4 +- src/functionObjects/field/ddt2/ddt2.C | 6 +- .../field/derivedFields/derivedFields.C | 4 +- .../field/externalCoupled/externalCoupled.C | 4 +- ...oupledTemperatureMixedFvPatchScalarField.C | 4 +- .../fieldAverageItem/fieldAverageItemIO.C | 6 +- .../field/fieldMinMax/fieldMinMax.C | 6 +- .../field/fieldValues/fieldValue/fieldValue.C | 4 +- .../surfaceFieldValue/surfaceFieldValue.C | 2 +- src/functionObjects/field/flux/flux.C | 4 +- .../field/fluxSummary/fluxSummary.C | 6 +- .../field/histogram/histogram.C | 6 +- src/functionObjects/field/momentum/momentum.C | 18 +++--- src/functionObjects/field/pressure/pressure.C | 8 +-- .../field/reference/reference.C | 4 +- .../regionSizeDistribution.C | 2 +- .../stabilityBlendingFactor.C | 52 ++++++++--------- .../field/streamLine/streamLineBase.C | 8 +-- .../field/surfaceDistance/surfaceDistance.C | 4 +- .../field/zeroGradient/zeroGradient.C | 4 +- src/functionObjects/forces/forces/forces.C | 4 +- .../hydrostaticPressure/hydrostaticPressure.C | 4 +- .../lagrangian/dataCloud/dataCloud.C | 8 +-- .../icoUncoupledKinematicCloud.C | 6 +- .../lagrangian/vtkCloud/vtkCloud.C | 10 ++-- .../solvers/energyTransport/energyTransport.C | 10 ++-- .../solvers/scalarTransport/scalarTransport.C | 22 ++++---- src/functionObjects/utilities/abort/abort.C | 4 +- .../utilities/areaWrite/areaWrite.C | 4 +- .../utilities/ensightWrite/ensightWrite.C | 14 ++--- .../averageCondition/averageCondition.C | 8 +-- .../equationInitialResidualCondition.C | 4 +- .../equationMaxIterCondition.C | 4 +- .../maxDurationCondition.C | 4 +- .../runTimeCondition/runTimeCondition.C | 8 +-- .../utilities/runTimeControl/runTimeControl.C | 4 +- .../setTimeStep/setTimeStepFunctionObject.C | 4 +- .../utilities/solverInfo/solverInfo.C | 4 +- .../utilities/systemCall/systemCall.C | 4 +- .../thermoCoupleProbes/thermoCoupleProbes.C | 4 +- .../utilities/timeInfo/timeInfo.C | 4 +- .../utilities/vtkWrite/vtkWrite.C | 16 +++--- .../utilities/vtkWrite/vtkWriteUpdate.C | 4 +- .../utilities/writeObjects/writeObjects.C | 6 +- .../pairPatchAgglomeration.C | 6 +- ...lacementComponentLaplacianFvMotionSolver.C | 4 +- .../surfaceAlignedSBRStressFvMotionSolver.C | 12 ++-- .../velocityLaplacianFvMotionSolver.C | 4 +- ...surfaceDisplacementPointPatchVectorField.C | 5 +- ...aceSlipDisplacementPointPatchVectorField.C | 5 +- ...meVaryingMappedFixedValuePointPatchField.C | 7 ++- .../waveDisplacementPointPatchVectorField.C | 3 +- .../fixedTemperatureConstraint.C | 3 +- .../limitTemperature/limitTemperature.C | 2 +- .../corrections/limitVelocity/limitVelocity.C | 4 +- .../interRegionOption/interRegionOption.C | 8 +-- .../acousticDampingSource.C | 4 +- .../derived/buoyancyEnergy/buoyancyEnergy.C | 4 +- ...irectionalPressureGradientExplicitSource.C | 6 +- .../effectivenessHeatExchangerSource.C | 8 +-- .../explicitPorositySource.C | 3 +- .../meanVelocityForce/meanVelocityForce.C | 4 +- .../multiphaseStabilizedTurbulence.C | 10 ++-- .../profileModel/profileModel.C | 4 +- .../trimModel/targetCoeff/targetCoeffTrim.C | 3 +- .../solidificationMeltingSource.C | 16 +++--- .../tabulatedAccelerationSource.C | 3 +- .../viscousDissipation/viscousDissipation.C | 8 +-- .../interRegionExplicitPorositySource.C | 5 +- .../interRegionHeatTransferModel.C | 5 +- .../tabulatedHeatTransfer.C | 5 +- .../tabulatedNTUHeatTransfer.C | 10 ++-- .../variableHeatTransfer.C | 3 +- src/lagrangian/basic/Cloud/CloudIO.C | 2 +- .../COxidationIntrinsicRate.C | 4 +- .../Templates/KinematicCloud/KinematicCloud.C | 4 +- .../cloudSolution/cloudSolution.C | 3 +- .../ParticleCollector/ParticleCollector.C | 4 +- .../ParticleErosion/ParticleErosion.C | 4 +- .../ParticleTrap/ParticleTrap.C | 3 +- .../PatchCollisionDensity.C | 3 +- .../HeterogeneousReactingModel.C | 4 +- .../PairCollision/PairCollision.C | 6 +- .../PairModel/PairModel/PairModel.C | 4 +- .../InflationInjection/InflationInjection.C | 4 +- .../InjectedParticleDistributionInjection.C | 6 +- .../InjectedParticleInjection.C | 4 +- .../InjectionModel/InjectionModel.C | 6 +- .../ManualInjection/ManualInjection.C | 4 +- .../PatchFlowRateInjection.C | 6 +- .../ParticleForces/Lift/LiftForce/LiftForce.C | 3 +- .../NonInertialFrame/NonInertialFrameForce.C | 9 +-- .../Paramagnetic/ParamagneticForce.C | 3 +- .../PressureGradient/PressureGradientForce.C | 3 +- .../LocalInteraction/LocalInteraction.C | 6 +- .../LocalInteraction/patchInteractionData.C | 5 +- .../PatchInteractionModel.C | 4 +- .../StandardWallInteraction.C | 8 +-- .../SurfaceFilmModel/SurfaceFilmModel.C | 3 +- .../SuppressionCollision.C | 4 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 6 +- .../BreakupModel/BreakupModel/BreakupModel.C | 5 +- .../movement/lumpedPointMovement.C | 12 ++-- .../state/lumpedPointState.C | 4 +- .../extrudeModel/extrudeModel/extrudeModel.C | 5 +- .../extrudeModel/linearNormal/linearNormal.C | 4 +- .../extrudeModel/linearRadial/linearRadial.C | 3 +- .../offsetSurface/offsetSurface.C | 4 +- .../medialAxisMeshMover.C | 18 +++--- .../meshRefinementProblemCells.C | 4 +- .../refinementSurfaces/refinementSurfaces.C | 10 ++-- .../shellSurfaces/shellSurfaces.C | 8 +-- .../layerParameters/layerParameters.C | 6 +- .../refinementParameters.C | 18 +++--- .../snapParameters/snapParameters.C | 31 +++++----- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 14 ++--- .../cyclicPeriodicAMIPolyPatch.C | 6 +- .../PatchFunction1/MappedFile/MappedFile.C | 16 +++--- .../rotation/EulerCoordinateRotation.C | 6 +- .../rotation/STARCDCoordinateRotation.C | 4 +- .../coordinate/rotation/axisAngleRotation.C | 4 +- .../coordinate/systems/coordinateSystemNew.C | 6 +- .../coordinate/systems/cylindricalCS.C | 8 +-- .../mappedPolyPatch/mappedPatchBase.C | 18 +++--- .../searchableCone/searchableCone.C | 6 +- .../searchableSurfaces/searchableSurfaces.C | 4 +- .../cylinderToCell/cylinderToCell.C | 4 +- .../cellSources/regionToCell/regionToCell.C | 6 +- .../searchableSurfaceToCell.C | 4 +- .../cellSources/sphereToCell/sphereToCell.C | 4 +- .../cellSources/surfaceToCell/surfaceToCell.C | 4 +- .../targetVolumeToCell/targetVolumeToCell.C | 4 +- .../cylinderToFace/cylinderToFace.C | 4 +- .../searchableSurfaceToFace.C | 4 +- .../faceSources/sphereToFace/sphereToFace.C | 4 +- .../searchableSurfaceToFaceZone.C | 4 +- .../setsToFaceZone/setsToFaceZone.C | 4 +- .../cylinderToPoint/cylinderToPoint.C | 4 +- .../searchableSurfaceToPoint.C | 4 +- .../sphereToPoint/sphereToPoint.C | 4 +- .../surfaceToPoint/surfaceToPoint.C | 2 +- .../surfaceIntersection/surfaceIntersection.C | 2 +- .../adjoint/ATCModel/ATCModel/ATCModel.C | 12 ++-- .../adjointWallVelocityFvPatchVectorField.C | 6 +- .../displacementMethoddisplacementLaplacian.C | 4 +- ...displacementMethodelasticityMotionSolver.C | 4 +- .../displacementMethodlaplacianMotionSolver.C | 4 +- .../displacementMethodvelocityLaplacian.C | 4 +- .../FIBase/FIBaseIncompressible.C | 4 +- .../SIBase/SIBaseIncompressible.C | 4 +- .../adjointEikonalSolverIncompressible.C | 8 +-- .../adjointMeshMovementSolverIncompressible.C | 6 +- .../sensitivityBezierFIIncompressible.C | 6 +- .../sensitivitySurfaceIncompressible.C | 20 +++---- .../sensitivitySurfacePointsIncompressible.C | 18 +++--- .../shapeSensitivitiesBase.C | 4 +- .../ArmijoConditions/ArmijoConditions.C | 4 +- .../lineSearch/lineSearch/lineSearch.C | 12 ++-- .../stepUpdate/bisection/bisection.C | 4 +- .../stepUpdate/quadratic/quadratic.C | 4 +- .../stepUpdate/stepUpdate/stepUpdate.C | 4 +- .../optMeshMovement/optMeshMovement.C | 4 +- .../shapeOptimisationIncompressible.C | 6 +- .../optimisation/updateMethod/BFGS/BFGS.C | 10 ++-- .../optimisation/updateMethod/DBFGS/DBFGS.C | 12 ++-- .../optimisation/updateMethod/LBFGS/LBFGS.C | 8 +-- .../optimisation/updateMethod/SQP/SQP.C | 10 ++-- .../optimisation/updateMethod/SR1/SR1.C | 8 +-- .../conjugateGradient/conjugateGradient.C | 4 +- .../constraintProjection.C | 4 +- .../updateMethod/updateMethod/updateMethod.C | 2 +- .../NURBS3DVolume/NURBS3DVolume.C | 28 +++++----- .../adjointSolverManager.C | 4 +- .../adjointSolver/adjointSolver.C | 8 +-- .../incompressiblePrimalSolver.C | 6 +- .../adjoint/solvers/solver/solver.C | 6 +- .../optimisation/SIMPLEControlOpt.C | 4 +- .../solverControl/solverControl.C | 12 ++-- .../incompressible/incompressibleVars.C | 4 +- .../variablesSet/variablesSet/variablesSet.C | 4 +- .../adjointRASModel/adjointRASModel.C | 4 +- .../adjointSpalartAllmaras.C | 20 +++---- .../cellVolumeWeightCellCellStencil.C | 4 +- .../inverseDistanceCellCellStencil.C | 6 +- .../trackingInverseDistanceCellCellStencil.C | 4 +- src/overset/regionsToCell/regionsToCell.C | 6 +- .../geometric/geometricConstraint.C | 4 +- .../decompositionMethod/decompositionMethod.C | 4 +- .../hierarchGeomDecomp/hierarchGeomDecomp.C | 4 +- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 4 +- .../decompose/scotchDecomp/scotchDecomp.C | 4 +- ...allBoilingWallFunctionFvPatchScalarField.C | 7 ++- ...ayatillekeWallFunctionFvPatchScalarField.C | 9 +-- ...ixedMultiPhaseHeatFluxFvPatchScalarField.C | 13 ++--- .../CHFModels/Zuber/Zuber.C | 2 +- .../CHFSubCoolModels/HuaXu/HuaXu.C | 2 +- .../LeidenfrostModels/Spiegler/Spiegler.C | 2 +- .../MHFModels/Jeschar/Jeschar.C | 2 +- .../TDNBModels/Schroeder/Schroeder.C | 2 +- .../TolubinskiKostanchuk.C | 7 ++- .../filmBoilingModels/Bromley/Bromley.C | 4 +- .../LemmertChawla/LemmertChawla.C | 3 +- .../heatTransferModel/heatTransferModel.C | 3 +- ...terfaceCompositionPhaseChangePhaseSystem.C | 3 +- .../MomentumTransferPhaseSystem.C | 5 +- .../ThermalPhaseChangePhaseSystem.C | 2 +- .../linearTsubDiameter/linearTsubDiameter.C | 8 +-- .../velocityGroup/velocityGroup.C | 7 ++- .../AnisothermalPhaseModel.C | 3 +- .../MultiComponentPhaseModel.C | 3 +- .../phaseModel/phaseModel/phaseModel.C | 3 +- .../LuoSvendsen/LuoSvendsen.C | 7 ++- .../LaakkonenAlopaeusAittamaa.C | 7 ++- .../CoulaloglouTavlaridesCoalescence.C | 5 +- .../LehrMilliesMewesCoalescence.C | 5 +- .../coalescenceModels/Luo/Luo.C | 5 +- .../PrinceBlanch/PrinceBlanch.C | 7 ++- .../driftModels/phaseChange/phaseChange.C | 3 +- .../populationBalanceModelI.H | 3 +- .../windowModels/Hanning/Hanning.C | 4 +- .../windowModels/windowModel/windowModel.C | 4 +- .../reactingOneDim/reactingOneDim.C | 4 +- ...sRadiativeCoupledMixedFvPatchScalarField.C | 8 +-- ...ysisTemperatureCoupledFvPatchScalarField.C | 9 +-- ...rolysisVelocityCoupledFvPatchVectorField.C | 9 +-- ...ilmHeightInletVelocityFvPatchVectorField.C | 7 ++- ...linedFilmNusseltHeightFvPatchScalarField.C | 4 +- ...lmNusseltInletVelocityFvPatchVectorField.C | 4 +- ...alphatFilmWallFunctionFvPatchScalarField.C | 13 +++-- .../nutkFilmWallFunctionFvPatchScalarField.C | 7 ++- .../kinematicSingleLayer.C | 4 +- .../contactAngleForce/contactAngleForce.C | 4 +- .../BrunDrippingInjection.C | 7 ++- .../curvatureSeparation/curvatureSeparation.C | 3 +- .../patchInjection/patchInjection.C | 4 +- .../transferModelList/transferModelList.C | 2 +- .../solidification/solidification.C | 3 +- .../standardPhaseChange/standardPhaseChange.C | 5 +- .../waxSolventEvaporation.C | 5 +- .../thermalBaffleModel/thermalBaffleModel.C | 5 +- src/renumber/SloanRenumber/SloanRenumber.C | 3 +- .../CuthillMcKeeRenumber.C | 3 +- .../linearAxialAngularSpring.C | 4 +- .../prescribedRotation/prescribedRotation.C | 4 +- .../rigidBodyModelState/rigidBodyModelState.C | 12 ++-- .../rigidBodyMotion/rigidBodyMotion.C | 13 +++-- .../rigidBodyMotion/rigidBodyMotionIO.C | 7 ++- .../CrankNicolson/CrankNicolson.C | 5 +- .../rigidBodySolvers/Newmark/Newmark.C | 5 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 6 +- .../rigidBodyMeshMotionSolver.C | 4 +- src/sampling/probes/probes.C | 4 +- .../sampledSet/cellCentre/cellCentreSet.C | 6 +- .../sampledSet/patchEdge/patchEdgeSet.C | 4 +- .../sampledSet/patchSeed/patchSeedSet.C | 2 +- .../sampledSet/shortestPath/shortestPathSet.C | 4 +- .../distanceSurface/sampledDistanceSurface.C | 4 +- .../sampledCuttingSurface.C | 6 +- .../sampledPatch/sampledPatch.C | 4 +- .../sampledPatchInternalField.C | 4 +- .../sampledPlane/sampledPlane.C | 4 +- .../sampledSurface/sampledSurface.C | 10 ++-- .../sampledSurfaces/sampledSurfaces.C | 20 +++---- .../sampledThresholdCellFaces.C | 8 +-- src/sampling/surface/cutting/cuttingSurface.C | 4 +- ...ableBaffleMassFractionFvPatchScalarField.C | 5 +- ...ermeableBaffleVelocityFvPatchVectorField.C | 3 +- ...gidBodyDisplacementPointPatchVectorField.C | 3 +- .../sixDoFRigidBodyMotionLineConstraint.C | 3 +- .../sixDoFRigidBodyMotionPlaneConstraint.C | 3 +- .../sixDoFRigidBodyMotionPointConstraint.C | 3 +- .../linearAxialAngularSpring.C | 2 +- .../linearSpringDamper/linearSpringDamper.C | 8 +-- .../sphericalAngularSpring.C | 4 +- .../tabulatedAxialAngularSpring.C | 4 +- .../sixDoFRigidBodyMotion.C | 12 ++-- .../sixDoFRigidBodyMotionIO.C | 7 ++- .../sixDoFRigidBodyMotionState.C | 15 ++--- .../sixDoFRigidBodyMotionSolver.C | 6 +- .../CrankNicolson/CrankNicolson.C | 5 +- .../sixDoFSolvers/Newmark/Newmark.C | 5 +- .../sixDoFRigidBodyState.C | 4 +- .../writers/nastran/nastranSurfaceWriter.C | 2 +- .../basic/basicThermo/basicThermo.C | 14 ++--- .../StandardChemistryModel.C | 3 +- .../TDACChemistryModel/TDACChemistryModel.C | 4 +- .../TDACChemistryModel/reduction/DAC/DAC.C | 21 +++---- .../chemistryReductionMethod.C | 7 ++- .../TDACChemistryModel/tabulation/ISAT/ISAT.C | 16 +++--- .../tabulation/ISAT/binaryTree/binaryTree.C | 2 +- .../ISAT/chemPointISAT/chemPointISAT.C | 6 +- .../chemistryTabulationMethod.C | 7 ++- .../basicChemistryModelTemplates.C | 6 +- .../MarshakRadiationFvPatchScalarField.C | 2 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 4 +- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 24 +++++--- .../radiationModel/radiationModel.C | 10 ++-- .../solarLoad/faceReflecting/faceReflecting.C | 6 +- .../radiationModels/viewFactor/viewFactor.C | 4 +- .../mixtureFractionSoot/mixtureFractionSoot.C | 3 +- .../chemistryReader/chemistryReader.C | 4 +- .../chemkinReader/chemkinReader.C | 5 +- .../foamChemistryReader/foamChemistryReader.C | 2 +- .../specie/specie/specie.C | 3 +- ...emperatureCoupledMixedFvPatchScalarField.C | 18 +++--- .../viscosityModels/Arrhenius/Arrhenius.C | 4 +- .../viscosityModels/BirdCarreau/BirdCarreau.C | 6 +- .../temperatureDependentSurfaceTension.C | 5 +- ...ndentAlphaContactAngleFvPatchScalarField.C | 4 +- .../waveAlpha/waveAlphaFvPatchScalarField.C | 4 +- .../waveVelocityFvPatchVectorField.C | 4 +- .../multiphaseMangrovesSource.C | 4 +- 624 files changed, 2109 insertions(+), 1954 deletions(-) diff --git a/applications/solvers/basic/potentialFoam/createControls.H b/applications/solvers/basic/potentialFoam/createControls.H index 7015cae02e..1d0c80b47e 100644 --- a/applications/solvers/basic/potentialFoam/createControls.H +++ b/applications/solvers/basic/potentialFoam/createControls.H @@ -5,5 +5,5 @@ const dictionary& potentialFlow const int nNonOrthCorr ( - potentialFlow.lookupOrDefault("nNonOrthogonalCorrectors", 0) + potentialFlow.getOrDefault("nNonOrthogonalCorrectors", 0) ); diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H index 7015cae02e..1d0c80b47e 100644 --- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H +++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createControls.H @@ -5,5 +5,5 @@ const dictionary& potentialFlow const int nNonOrthCorr ( - potentialFlow.lookupOrDefault("nNonOrthogonalCorrectors", 0) + potentialFlow.getOrDefault("nNonOrthogonalCorrectors", 0) ); diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index a2f6deab5e..e8c36a390c 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -72,7 +72,7 @@ PDRkEpsilon::PDRkEpsilon C4_ ( - dimensioned::lookupOrAddToDict + dimensioned::getOrAddToDict ( "C4", coeffDict_, diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H index 4c888d9e3a..135a62f131 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/createControls.H @@ -2,10 +2,10 @@ bool correctPhi ( - pimple.dict().lookupOrDefault("correctPhi", true) + pimple.dict().getOrDefault("correctPhi", true) ); bool checkMeshCourantNo ( - pimple.dict().lookupOrDefault("checkMeshCourantNo", false) + pimple.dict().getOrDefault("checkMeshCourantNo", false) ); diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H index 08ab3a6af7..7d966e2cf9 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/readControls.H @@ -1,6 +1,6 @@ #include "readTimeControls.H" -correctPhi = pimple.dict().lookupOrDefault("correctPhi", true); +correctPhi = pimple.dict().getOrDefault("correctPhi", true); checkMeshCourantNo = - pimple.dict().lookupOrDefault("checkMeshCourantNo", false); + pimple.dict().getOrDefault("checkMeshCourantNo", false); diff --git a/applications/solvers/combustion/fireFoam/createRegionControls.H b/applications/solvers/combustion/fireFoam/createRegionControls.H index 6734f6168e..4f0206ecfe 100644 --- a/applications/solvers/combustion/fireFoam/createRegionControls.H +++ b/applications/solvers/combustion/fireFoam/createRegionControls.H @@ -12,12 +12,12 @@ IOdictionary additionalControlsDict bool solvePrimaryRegion ( - additionalControlsDict.lookupOrDefault("solvePrimaryRegion", true) + additionalControlsDict.getOrDefault("solvePrimaryRegion", true) ); bool solvePyrolysisRegion ( - additionalControlsDict.lookupOrDefault("solvePyrolysisRegion", true) + additionalControlsDict.getOrDefault("solvePyrolysisRegion", true) ); scalar maxDi = pyrolysis.maxDiff(); diff --git a/applications/solvers/combustion/fireFoam/phrghEqn.H b/applications/solvers/combustion/fireFoam/phrghEqn.H index 5d844d61cc..482355f12a 100644 --- a/applications/solvers/combustion/fireFoam/phrghEqn.H +++ b/applications/solvers/combustion/fireFoam/phrghEqn.H @@ -1,4 +1,4 @@ -if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false)) +if (pimple.dict().getOrDefault("hydrostaticInitialization", false)) { volScalarField& ph_rgh = regIOobject::store ( @@ -24,7 +24,7 @@ if (pimple.dict().lookupOrDefault("hydrostaticInitialization", false)) label nCorr ( - pimple.dict().lookupOrDefault