From 5eaf74c3a4692b1ed0833c6d81f9f0c1c9a4c1f9 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 27 Nov 2019 14:56:32 +0000 Subject: [PATCH] dictionary scalar lookup: simplified syntax using the type templated lookup function Replaced readScalar(dict.lookup("name")) with dict.lookup("name") --- .../XiGModels/basicXiSubG/basicXiSubG.C | 4 +- .../XiModels/XiEqModels/Gulder/Gulder.C | 6 +- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 10 +- .../instabilityXiEq/instabilityXiEq.C | 4 +- .../PDRFoam/XiModels/XiGModels/KTS/KTS.C | 4 +- .../PDRFoam/XiModels/algebraic/algebraic.C | 4 +- .../PDRFoam/XiModels/transport/transport.C | 4 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 14 +- .../combustion/chemFoam/createControls.H | 2 +- .../combustion/chemFoam/createFields.H | 4 +- .../combustion/chemFoam/readControls.H | 2 +- .../chemFoam/readInitialConditions.H | 4 +- .../combustion/reactingFoam/setRDeltaT.H | 4 +- .../T/smoluchowskiJumpTFvPatchScalarField.C | 2 +- .../BCs/U/maxwellSlipUFvPatchVectorField.C | 2 +- .../readmdEquilibrationDict.H | 6 +- .../solvers/lagrangian/DPMFoam/createFields.H | 7 +- .../lagrangian/coalChemistryFoam/setRDeltaT.H | 2 +- .../reactingParcelFoam/setRDeltaT.H | 2 +- .../solvers/multiphase/VoF/alphaCourantNo.H | 4 +- .../cavitatingFoam/createControls.H | 2 +- .../multiphase/cavitatingFoam/readControls.H | 2 +- .../multiphaseMixtureThermo.C | 2 +- .../threePhaseInterfaceProperties.C | 11 +- .../multiphaseMixture/multiphaseMixture.C | 2 +- ...ocamustafaogullariIshiiDepartureDiameter.C | 2 +- .../Lavieville/Lavieville.C | 2 +- .../partitioningModels/cosine/cosine.C | 4 +- .../partitioningModels/linear/linear.C | 4 +- .../deposition/deposition.C | 2 +- .../wallLubricationModels/Frank/Frank.C | 4 +- .../sizeGroup/shapeModels/fractal/fractal.C | 2 +- .../KochFriedlander/KochFriedlander.C | 8 +- .../velocityGroup/sizeGroup/sizeGroup.C | 4 +- .../powerLawUniformBinary.C | 4 +- .../breakupModels/exponential/exponential.C | 6 +- .../breakupModels/powerLaw/powerLaw.C | 4 +- .../populationBalanceModel.C | 2 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../twoLiquidMixingFoam/alphaCourantNo.H | 4 +- .../wallLubricationModels/Frank/Frank.C | 4 +- .../phasePressureModel/phasePressureModel.C | 6 +- .../solidDisplacementFoam/createControls.H | 2 +- ...ydrostaticDisplacementFvPatchVectorField.C | 4 +- .../readSolidDisplacementFoamControls.H | 2 +- .../solidDisplacementThermo.C | 2 +- .../readSteadyStressFoamControls.H | 2 +- applications/test/Function1/Test-Function1.C | 4 +- .../test/HashTable3/Test-HashTable3.C | 4 +- applications/test/ODE/Test-ODE.C | 10 +- applications/test/PackedList2/Make/files | 3 - applications/test/PackedList2/Make/options | 0 .../test/PackedList2/Test-PackedList2.C | 379 ------------------ .../test/PackedList3/Test-PackedList3.C | 3 +- .../test/PackedList4/Test-PackedList4.C | 6 +- .../test/dictionary/Test-dictionary.C | 2 +- .../Test-fvSolutionCombine.C | 4 +- .../Test-rigidBodyDynamics.C | 4 +- .../advanced/autoRefineMesh/autoRefineMesh.C | 8 +- .../mesh/advanced/selectCells/selectCells.C | 4 +- .../cv2DControls/cv2DControls.C | 16 +- .../backgroundMeshDecomposition.C | 4 +- .../linearDistance/linearDistance.C | 6 +- .../linearSpatial/linearSpatial.C | 6 +- .../surfaceOffsetLinearDistance.C | 10 +- .../uniformDistance/uniformDistance.C | 4 +- .../automatic/automatic.C | 6 +- .../uniformValue/uniformValue.C | 4 +- .../conformalVoronoiMesh.C | 15 +- .../conformalVoronoiMeshCalcDualMesh.C | 2 +- .../cvControls/cvControls.C | 106 ++--- .../piecewiseLinearRamp/piecewiseLinearRamp.C | 6 +- .../autoDensity/autoDensity.C | 2 +- .../bodyCentredCubic/bodyCentredCubic.C | 6 +- .../faceCentredCubic/faceCentredCubic.C | 6 +- .../initialPointsMethod/initialPointsMethod.C | 10 +- .../initialPointsMethod/pointFile/pointFile.C | 2 +- .../rayShooting/rayShooting.C | 4 +- .../uniformGrid/uniformGrid.C | 6 +- .../adaptiveLinear/adaptiveLinear.C | 6 +- .../rampHoldFall/rampHoldFall.C | 12 +- .../triSurfaceMeshFeatures.C | 4 +- .../foamyQuadMesh/shortEdgeFilter2D.C | 2 +- .../generation/snappyHexMesh/snappyHexMesh.C | 11 +- .../manipulation/mirrorMesh/mirrorFvMesh.C | 2 +- .../manipulation/mirrorMesh/readMirrorDict.H | 2 +- .../decomposePar/domainDecomposition.C | 11 +- .../foamToGMV/readConversionProperties.H | 2 +- .../preProcessing/boxTurb/readBoxTurbDict.H | 4 +- .../SpaldingsLaw/SpaldingsLaw.C | 6 +- .../surfaceFeatureExtract.C | 6 +- .../surface/surfaceFeatures/surfaceFeatures.C | 6 +- .../surface/surfaceSubset/surfaceSubset.C | 6 +- .../adiabaticFlameT/adiabaticFlameT.C | 10 +- .../equilibriumFlameT/equilibriumFlameT.C | 6 +- .../mixtureAdiabaticFlameT.C | 4 +- etc/codeTemplates/BC/BC.C | 2 +- .../functionObject/FUNCTIONOBJECT.C | 2 +- etc/controlDict | 1 - src/OpenFOAM/db/Time/TimeIO.C | 4 +- .../functionObjects/timeControl/timeControl.C | 4 +- src/OpenFOAM/global/argList/argList.C | 7 +- .../interpolationLookUpTable.C | 4 +- .../uniformInterpolationTable.C | 8 +- src/OpenFOAM/matrices/solution/solution.C | 8 +- src/OpenFOAM/matrices/tolerances/tolerances.C | 8 +- .../meshes/primitiveShapes/plane/plane.C | 8 +- .../functions/Function1/Sine/Sine.C | 2 +- .../functions/Function1/Square/Square.C | 2 +- ...convectiveHeatTransferFvPatchScalarField.C | 2 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 2 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 7 +- .../anisotropicFilter/anisotropicFilter.C | 4 +- .../LESfilters/laplaceFilter/laplaceFilter.C | 4 +- ...thDissipationRateInletFvPatchScalarField.C | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 2 +- .../porousBafflePressureFvPatchField.C | 6 +- .../atmBoundaryLayer/atmBoundaryLayer.C | 4 +- .../kEpsilonLopesdaCosta.C | 6 +- .../powerLawLopesdaCosta.C | 8 +- src/combustionModels/FSD/FSD.C | 4 +- .../consumptionSpeed/consumptionSpeed.C | 10 +- .../relaxation/relaxation.C | 6 +- src/combustionModels/PaSR/PaSR.C | 2 +- src/combustionModels/diffusion/diffusion.C | 2 +- .../infinitelyFastChemistry.C | 2 +- src/combustionModels/laminar/laminar.C | 2 +- .../greyMeanCombustion/greyMeanCombustion.C | 2 +- .../mixtureFraction/mixtureFraction.C | 4 +- .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C | 6 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 +- .../layerAdditionRemoval.C | 6 +- .../motionSmoother/motionSmootherAlgo.C | 4 +- .../motionSmoother/motionSmootherAlgoCheck.C | 50 +-- .../displacementLinearMotionMotionSolver.C | 4 +- .../interpolatingSolidBodyMotionSolver.C | 4 +- .../polyMeshFilter/polyMeshFilterSettings.C | 6 +- src/engine/enginePiston/enginePiston.C | 6 +- src/engine/engineValve/engineValve.C | 14 +- src/engine/ignition/ignitionSiteIO.C | 18 +- src/engine/include/StCorr.H | 14 +- .../cfdTools/general/SRF/SRFModel/rpm/rpm.C | 4 +- .../general/findRefCell/findRefCell.C | 2 +- .../porosityModel/fixedCoeff/fixedCoeff.C | 4 +- .../general/porosityModel/powerLaw/powerLaw.C | 6 +- .../general/pressureControl/pressureControl.C | 12 +- .../singleRegionConvergenceControl.C | 4 +- .../singleRegionCorrectorConvergenceControl.C | 8 +- .../activeBaffleVelocityFvPatchVectorField.C | 6 +- ...ureForceBaffleVelocityFvPatchVectorField.C | 8 +- .../fixedProfile/fixedProfileFvPatchField.C | 2 +- ...OutletTotalTemperatureFvPatchScalarField.C | 2 +- ...aseHydrostaticPressureFvPatchScalarField.C | 4 +- .../plenumPressureFvPatchScalarField.C | 20 +- .../supersonicFreestreamFvPatchVectorField.C | 6 +- .../syringePressureFvPatchScalarField.C | 20 +- .../totalPressureFvPatchScalarField.C | 2 +- .../totalTemperatureFvPatchScalarField.C | 2 +- ...sityKineticEnergyInletFvPatchScalarField.C | 2 +- ...ityHydrostaticPressureFvPatchScalarField.C | 4 +- .../uniformTotalPressureFvPatchScalarField.C | 2 +- .../variableHeightFlowRateFvPatchField.C | 4 +- .../waveTransmissiveFvPatchField.C | 2 +- .../field/fieldAverage/fieldAverage.C | 2 +- .../field/nearWallFields/nearWallFields.C | 4 +- ...llatingDisplacementPointPatchVectorField.C | 6 +- ...OscillatingVelocityPointPatchVectorField.C | 6 +- ...llatingDisplacementPointPatchVectorField.C | 2 +- ...oscillatingVelocityPointPatchVectorField.C | 2 +- .../waveDisplacementPointPatchVectorField.C | 2 +- .../limitTemperature/limitTemperature.C | 4 +- .../corrections/limitVelocity/limitVelocity.C | 4 +- .../actuationDiskSource/actuationDiskSource.C | 8 +- .../effectivenessHeatExchangerSource.C | 8 +- .../PhaseLimitStabilization.C | 4 +- .../derived/rotorDiskSource/rotorDiskSource.C | 4 +- .../trimModel/fixed/fixedTrim.C | 8 +- .../trimModel/targetCoeff/targetCoeffTrim.C | 16 +- .../solidificationMeltingSource.C | 12 +- .../variableHeatTransfer.C | 12 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 20 +- .../Templates/DSMCParcel/DSMCParcelI.H | 6 +- .../LarsenBorgnakkeVariableHardSphere.C | 6 +- .../VariableHardSphere/VariableHardSphere.C | 4 +- .../FreeStream/FreeStream.C | 6 +- .../MixedDiffuseSpecular.C | 7 +- .../COxidationDiffusionLimitedRate.C | 6 +- .../COxidationHurtMitchell.C | 2 +- .../COxidationIntrinsicRate.C | 14 +- .../COxidationKineticDiffusionLimitedRate.C | 10 +- .../COxidationMurphyShaddix.C | 16 +- .../RosinRammler/RosinRammler.C | 8 +- .../exponential/exponential.C | 6 +- .../fixedValue/fixedValue.C | 2 +- .../massRosinRammler/massRosinRammler.C | 8 +- .../multiNormal/multiNormal.C | 4 +- .../distributionModels/normal/normal.C | 8 +- .../distributionModels/uniform/uniform.C | 4 +- .../phaseProperties/phasePropertiesIO.C | 4 +- .../ParticleErosion/ParticleErosion.C | 4 +- .../ParticleTrap/ParticleTrap.C | 4 +- .../PatchPostProcessing/PatchPostProcessing.C | 7 +- .../PairCollision/PairCollision.C | 4 +- .../PairSpringSliderDashpot.C | 15 +- .../WallLocalSpringSliderDashpot.C | 26 +- .../WallSpringSliderDashpot.C | 22 +- .../CellZoneInjection/CellZoneInjection.C | 4 +- .../ConeInjection/ConeInjection.C | 4 +- .../FieldActivatedInjection.C | 2 +- .../InflationInjection/InflationInjection.C | 6 +- .../InjectionModel/InjectionModel.C | 5 +- .../KinematicLookupTableInjection.C | 6 +- .../kinematicParcelInjectionData.C | 8 +- .../PatchFlowRateInjection.C | 6 +- .../PatchInjection/PatchInjection.C | 6 +- .../Drag/NonSphereDrag/NonSphereDragForce.C | 2 +- .../Lift/TomiyamaLift/TomiyamaLiftForce.C | 4 +- .../Paramagnetic/ParamagneticForce.C | 4 +- .../ParticleForces/Scaled/ScaledForce.C | 2 +- .../VirtualMass/VirtualMassForce.C | 4 +- .../PatchInteractionModel/Rebound/Rebound.C | 4 +- .../absolute/absolute.C | 4 +- .../relative/relative.C | 4 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 6 +- .../HarrisCrighton/HarrisCrighton.C | 8 +- .../MPPIC/ParticleStressModels/Lun/Lun.C | 6 +- .../ParticleStressModel/ParticleStressModel.C | 4 +- .../exponential/exponential.C | 8 +- .../TimeScaleModel/TimeScaleModel.C | 6 +- .../ReactingLookupTableInjection.C | 6 +- .../ConstantRateDevolatilisation.C | 4 +- .../SingleKineticRateDevolatilisation.C | 2 +- .../ReactingMultiphaseLookupTableInjection.C | 6 +- .../ThermoLookupTableInjection.C | 6 +- .../thermoParcelInjectionData.C | 6 +- .../correlationFunction/correlationFunction.C | 8 +- .../molecule/moleculeCloud/moleculeCloud.C | 15 +- .../molecule/reducedUnits/reducedUnits.C | 6 +- .../derived/doubleSigmoid/doubleSigmoid.C | 10 +- .../derived/sigmoid/sigmoid.C | 6 +- .../pairPotential/basic/pairPotential.C | 8 +- .../pairPotential/derived/azizChen/azizChen.C | 20 +- .../derived/dampedCoulomb/dampedCoulomb.C | 4 +- .../exponentialRepulsion.C | 6 +- .../derived/lennardJones/lennardJones.C | 6 +- .../derived/maitlandSmith/maitlandSmith.C | 10 +- .../potential/potential/potential.C | 8 +- .../derived/harmonicSpring/harmonicSpring.C | 7 +- .../derived/pitchForkRing/pitchForkRing.C | 8 +- .../restrainedHarmonicSpring.C | 13 +- .../BlobsSheetAtomization.C | 6 +- .../LISAAtomization/LISAAtomization.C | 10 +- .../BreakupModel/BreakupModel/BreakupModel.C | 4 +- .../spray/submodels/BreakupModel/SHF/SHF.C | 60 +-- .../TrajectoryCollision/TrajectoryCollision.C | 6 +- .../BrownianMotion/BrownianMotionForce.C | 4 +- .../linearDirection/linearDirection.C | 4 +- .../extrudeModel/linearNormal/linearNormal.C | 4 +- .../extrudeModel/linearRadial/linearRadial.C | 4 +- src/mesh/extrudeModel/sector/sector.C | 4 +- .../extrudeModel/sigmaRadial/sigmaRadial.C | 8 +- .../medialAxisMeshMover.C | 32 +- .../meshRefinementProblemCells.C | 12 +- .../refinementSurfaces/refinementSurfaces.C | 5 +- .../layerParameters/layerParameters.C | 14 +- .../refinementParameters.C | 4 +- .../snapParameters/snapParameters.C | 2 +- .../mappedPolyPatch/mappedPatchBase.C | 2 +- .../searchableCylinder/searchableCylinder.C | 4 +- .../searchableDisk/searchableDisk.C | 4 +- .../searchableExtrudedCircle.C | 4 +- .../searchableSphere/searchableSphere.C | 4 +- .../searchableSurfaceWithGaps.C | 4 +- .../cylinderAnnulusToCell.C | 6 +- .../cylinderToCell/cylinderToCell.C | 4 +- .../cellSources/fieldToCell/fieldToCell.C | 4 +- .../cellSources/sphereToCell/sphereToCell.C | 4 +- .../cellSources/surfaceToCell/surfaceToCell.C | 6 +- .../targetVolumeToCell/targetVolumeToCell.C | 4 +- .../cylinderAnnulusToFace.C | 6 +- .../cylinderToFace/cylinderToFace.C | 4 +- .../faceSources/normalToFace/normalToFace.C | 4 +- .../surfaceToPoint/surfaceToPoint.C | 4 +- .../geomDecomp/geomDecomp.C | 4 +- .../distributedTriSurfaceMesh.C | 2 +- .../radiationModels/fvDOM/fvDOM.C | 4 +- .../processes/UOprocess/UOprocess.C | 10 +- .../filmTurbulenceModel/laminar/laminar.C | 4 +- .../contactAngleForce/contactAngleForce.C | 6 +- .../drippingInjection/drippingInjection.C | 6 +- .../constantRadiation/constantRadiation.C | 8 +- .../standardRadiation/standardRadiation.C | 6 +- .../constantHeatTransfer.C | 4 +- .../solidification/solidification.C | 4 +- .../standardPhaseChange/standardPhaseChange.C | 4 +- .../waxSolventEvaporation.C | 8 +- .../thermoSingleLayer/thermoSingleLayer.C | 2 +- .../thermalBaffleFvPatchScalarField.C | 2 +- .../springRenumber/springRenumber.C | 4 +- src/rigidBodyDynamics/bodies/cuboid/cuboidI.H | 4 +- src/rigidBodyDynamics/bodies/sphere/sphereI.H | 6 +- .../rigidBodyInertia/rigidBodyInertiaI.H | 4 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 6 +- .../rigidBodyMeshMotionSolver.C | 2 +- .../sampledSet/arcUniform/arcUniform.C | 4 +- .../boundaryPoints/boundaryPoints.C | 4 +- .../sampledSet/circleRandom/circleRandom.C | 2 +- .../sampledSet/sphereRandom/sphereRandom.C | 2 +- .../distanceSurface/distanceSurface.C | 2 +- .../isoSurface/sampledIsoSurface.C | 2 +- .../sampledPatchInternalField.C | 2 +- .../sixDoFRigidBodyMotion.C | 2 +- .../sixDoFRigidBodyMotionSolver.C | 6 +- .../TDACChemistryModel/reduction/DAC/DAC.C | 7 +- .../TDACChemistryModel/reduction/EFA/EFA.C | 2 +- .../TDACChemistryModel/tabulation/ISAT/ISAT.C | 13 +- .../basicChemistryModel/basicChemistryModel.C | 2 +- .../EulerImplicit/EulerImplicit.C | 2 +- ...xLimitedLangmuirHinshelwoodReactionRateI.H | 2 +- .../laminarFlameSpeed/Gulders/Gulders.C | 14 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 14 +- .../RaviPetersen/RaviPetersen.C | 4 +- .../transport/const/constIsoSolidTransport.C | 4 +- .../exponential/exponentialSolidTransport.C | 8 +- .../equationOfState/Boussinesq/Boussinesq.C | 8 +- .../PengRobinsonGas/PengRobinsonGas.C | 10 +- .../adiabaticPerfectFluid.C | 10 +- .../incompressiblePerfectGas.C | 4 +- .../specie/equationOfState/linear/linear.C | 6 +- .../perfectFluid/perfectFluid.C | 6 +- .../equationOfState/rhoConst/rhoConst.C | 2 +- .../ArrheniusReactionRateI.H | 6 +- .../JanevReactionRate/JanevReactionRateI.H | 6 +- .../LandauTellerReactionRateI.H | 10 +- .../MichaelisMentenReactionRateI.H | 4 +- .../SRIFallOffFunction/SRIFallOffFunctionI.H | 10 +- .../TroeFallOffFunctionI.H | 8 +- .../powerSeries/powerSeriesReactionRateI.H | 6 +- .../thirdBodyEfficienciesI.H | 2 +- .../specie/specie/specie.C | 4 +- .../specie/thermo/eConst/eConstThermo.C | 6 +- .../specie/thermo/eRefConst/eRefConstThermo.C | 10 +- .../specie/thermo/hConst/hConstThermo.C | 6 +- .../thermo/hPolynomial/hPolynomialThermo.C | 6 +- .../specie/thermo/hPower/hPowerThermo.C | 10 +- .../specie/thermo/hRefConst/hRefConstThermo.C | 10 +- .../specie/thermo/janaf/janafThermo.C | 8 +- .../specie/transport/WLF/WLFTransport.C | 6 +- .../specie/transport/const/constTransport.C | 6 +- .../sutherland/sutherlandTransport.C | 4 +- .../liquidProperties/liquidProperties.C | 20 +- .../solidProperties/solidProperties.C | 12 +- .../APIdiffCoefThermophysicalFunction.C | 8 +- .../NSRDS0/NSRDS0ThermophysicalFunction.C | 12 +- .../NSRDS1/NSRDS1ThermophysicalFunction.C | 10 +- .../NSRDS14/NSRDS14ThermophysicalFunction.C | 10 +- .../NSRDS2/NSRDS2ThermophysicalFunction.C | 8 +- .../NSRDS3/NSRDS3ThermophysicalFunction.C | 8 +- .../NSRDS4/NSRDS4ThermophysicalFunction.C | 10 +- .../NSRDS5/NSRDS5ThermophysicalFunction.C | 8 +- .../NSRDS6/NSRDS6ThermophysicalFunction.C | 12 +- .../NSRDS7/NSRDS7ThermophysicalFunction.C | 10 +- .../thermophysicalProperties.C | 2 +- .../linearValveLayersFvMesh.C | 10 +- .../mixerFvMesh/mixerFvMesh.C | 2 +- .../movingConeTopoFvMesh.C | 28 +- .../interfaceProperties/interfaceProperties.C | 7 +- ...stantAlphaContactAngleFvPatchScalarField.C | 2 +- ...namicAlphaContactAngleFvPatchScalarField.C | 12 +- ...ryingAlphaContactAngleFvPatchScalarField.C | 8 +- src/waves/waveModels/Airy/Airy.C | 4 +- src/waves/waveModels/solitary/solitary.C | 4 +- .../waveAtmBoundaryLayerSuperposition.C | 6 +- .../waveSuperposition/waveSuperposition.C | 2 +- .../validation/WatersKing/createFields.H | 4 +- 375 files changed, 1160 insertions(+), 1632 deletions(-) delete mode 100644 applications/test/PackedList2/Make/files delete mode 100644 applications/test/PackedList2/Make/options delete mode 100644 applications/test/PackedList2/Test-PackedList2.C diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C index ab669187b9..3534940a91 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid ) : XiGModel(XiGProperties, thermo, turbulence, Su), - k1(readScalar(XiGModelCoeffs_.lookup("k1"))), + k1(XiGModelCoeffs_.lookup("k1")), XiGModel_(XiGModel::New(XiGModelCoeffs_, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 2e74ee61dd..c6cbf7fcfe 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,9 +49,9 @@ Foam::XiEqModels::Gulder::Gulder ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))), + XiEqCoef_(XiEqModelCoeffs_.lookup("XiEqCoef")), SuMin_(0.01*Su.average()), - uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))), + uPrimeCoef_(XiEqModelCoeffs_.lookup("uPrimeCoef")), subGridSchelkin_ ( readBool(XiEqModelCoeffs_.lookup("subGridSchelkin")) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 75fa38e996..102c1b1926 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,11 +49,11 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))), - XiEqExp_(readScalar(XiEqModelCoeffs_.lookup("XiEqExp"))), - lCoef_(readScalar(XiEqModelCoeffs_.lookup("lCoef"))), + XiEqCoef_(XiEqModelCoeffs_.lookup("XiEqCoef")), + XiEqExp_(XiEqModelCoeffs_.lookup("XiEqExp")), + lCoef_(XiEqModelCoeffs_.lookup("lCoef")), SuMin_(0.01*Su.average()), - uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))), + uPrimeCoef_(XiEqModelCoeffs_.lookup("uPrimeCoef")), subGridSchelkin_ ( readBool(XiEqModelCoeffs_.lookup("subGridSchelkin")) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C index beb0e109be..aef76ae56c 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Foam::XiEqModels::instability::instability ) : XiEqModel(XiEqProperties, thermo, turbulence, Su), - XiEqIn(readScalar(XiEqModelCoeffs_.lookup("XiEqIn"))), + XiEqIn(XiEqModelCoeffs_.lookup("XiEqIn")), XiEqModel_(XiEqModel::New(XiEqModelCoeffs_, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C index f7e425c2d5..2bccdab59b 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ Foam::XiGModels::KTS::KTS ) : XiGModel(XiGProperties, thermo, turbulence, Su), - GEtaCoef_(readScalar(XiGModelCoeffs_.lookup("GEtaCoef"))) + GEtaCoef_(XiGModelCoeffs_.lookup("GEtaCoef")) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C index 6e37a6e4f4..28976ae09b 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,7 @@ Foam::XiModels::algebraic::algebraic ) : XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi), - XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))), + XiShapeCoef(XiModelCoeffs_.lookup("XiShapeCoef")), XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)), XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C index 3495f70579..40c3c3892d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ Foam::XiModels::transport::transport ) : XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi), - XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))), + XiShapeCoef(XiModelCoeffs_.lookup("XiShapeCoef")), XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)), XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su)) {} diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 999efbdc0c..b92ee552cc 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,8 +53,8 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial ) : FixedList(polyDict.lookup("coefficients")), - ll(readScalar(polyDict.lookup("lowerLimit"))), - ul(readScalar(polyDict.lookup("upperLimit"))), + ll(polyDict.lookup("lowerLimit")), + ul(polyDict.lookup("upperLimit")), llv(polyPhi(ll, *this)), ulv(polyPhi(ul, *this)), lu(0) @@ -82,12 +82,12 @@ Foam::laminarFlameSpeedModels::SCOPE::SCOPE )() ).optionalSubDict(typeName + "Coeffs") ), - LFL_(readScalar(coeffsDict_.lookup("lowerFlamabilityLimit"))), - UFL_(readScalar(coeffsDict_.lookup("upperFlamabilityLimit"))), + LFL_(coeffsDict_.lookup("lowerFlamabilityLimit")), + UFL_(coeffsDict_.lookup("upperFlamabilityLimit")), SuPolyL_(coeffsDict_.subDict("lowerSuPolynomial")), SuPolyU_(coeffsDict_.subDict("upperSuPolynomial")), - Texp_(readScalar(coeffsDict_.lookup("Texp"))), - pexp_(readScalar(coeffsDict_.lookup("pexp"))), + Texp_(coeffsDict_.lookup("Texp")), + pexp_(coeffsDict_.lookup("pexp")), MaPolyL_(coeffsDict_.subDict("lowerMaPolynomial")), MaPolyU_(coeffsDict_.subDict("upperMaPolynomial")) { diff --git a/applications/solvers/combustion/chemFoam/createControls.H b/applications/solvers/combustion/chemFoam/createControls.H index 6aeb2fff15..7597cb1e06 100644 --- a/applications/solvers/combustion/chemFoam/createControls.H +++ b/applications/solvers/combustion/chemFoam/createControls.H @@ -1,2 +1,2 @@ Switch adjustTimeStep(runTime.controlDict().lookup("adjustTimeStep")); -scalar maxDeltaT(readScalar(runTime.controlDict().lookup("maxDeltaT"))); +scalar maxDeltaT(runTime.controlDict().lookup("maxDeltaT")); diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index b259276fef..73eb4c26e3 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -18,8 +18,8 @@ ) ); - scalar p0 = readScalar(initialConditions.lookup("p")); - scalar T0 = readScalar(initialConditions.lookup("T")); + scalar p0 = initialConditions.lookup("p"); + scalar T0 = initialConditions.lookup("T"); #include "createBaseFields.H" diff --git a/applications/solvers/combustion/chemFoam/readControls.H b/applications/solvers/combustion/chemFoam/readControls.H index b9c4a0f612..b489fdadd2 100644 --- a/applications/solvers/combustion/chemFoam/readControls.H +++ b/applications/solvers/combustion/chemFoam/readControls.H @@ -1,2 +1,2 @@ runTime.controlDict().lookup("adjustTimeStep") >> adjustTimeStep; -maxDeltaT = readScalar(runTime.controlDict().lookup("maxDeltaT")); +maxDeltaT = runTime.controlDict().lookup("maxDeltaT"); diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index c49c09ba70..fbe54bb79a 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -35,7 +35,7 @@ const word& name = Y[i].name(); if (fractions.found(name)) { - X0[i] = readScalar(fractions.lookup(name)); + X0[i] = fractions.lookup(name); } } @@ -59,7 +59,7 @@ const word& name = Y[i].name(); if (fractions.found(name)) { - Y0[i] = readScalar(fractions.lookup(name)); + Y0[i] = fractions.lookup(name); } } diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H index 090b885416..8cbb7c11c3 100644 --- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H +++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.lookup("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", great)); @@ -118,7 +118,7 @@ License if (Yref.found(Yi.name())) { foundY = true; - scalar Yrefi = readScalar(Yref.lookup(Yi.name())); + scalar Yrefi = Yref.lookup(Yi.name()); rDeltaTY.field() = max ( diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C index 61614bdce6..1a33e33c18 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C @@ -84,7 +84,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField rhoName_(dict.lookupOrDefault("rho", "rho")), psiName_(dict.lookupOrDefault("psi", "thermo:psi")), muName_(dict.lookupOrDefault("mu", "thermo:mu")), - accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))), + accommodationCoeff_(dict.lookup("accommodationCoeff")), Twall_("Twall", dict, p.size()), gamma_(dict.lookupOrDefault("gamma", 1.4)) { diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index 78a67869d9..a0fc785a79 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C @@ -85,7 +85,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField psiName_(dict.lookupOrDefault("psi", "thermo:psi")), muName_(dict.lookupOrDefault("mu", "thermo:mu")), tauMCName_(dict.lookupOrDefault("tauMC", "tauMC")), - accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))), + accommodationCoeff_(dict.lookup("accommodationCoeff")), Uwall_("Uwall", dict, p.size()), thermalCreep_(dict.lookupOrDefault("thermalCreep", true)), curvature_(dict.lookupOrDefault("curvature", true)) diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H index 3f43981907..a8fdbbf726 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H @@ -12,7 +12,5 @@ IOdictionary mdEquilibrationDict ) ); -scalar targetTemperature = readScalar -( - mdEquilibrationDict.lookup("targetTemperature") -); +scalar targetTemperature = + mdEquilibrationDict.lookup("targetTemperature"); diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index e5a992b84b..d8bd000f1c 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -139,11 +139,8 @@ basicKinematicTypeCloud kinematicCloud scalar alphacMin ( 1.0 - - readScalar - ( - kinematicCloud.particleProperties().subDict("constantProperties") - .lookup("alphaMax") - ) + - kinematicCloud.particleProperties().subDict("constantProperties") + .lookup("alphaMax") ); // Update alphac from the particle locations diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H index 7de2729338..0c1e3d4d0f 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.lookup("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", great)); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H index c192454c53..d1bd25ccd7 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H @@ -29,7 +29,7 @@ License const dictionary& pimpleDict = pimple.dict(); // Maximum flow Courant number - scalar maxCo(readScalar(pimpleDict.lookup("maxCo"))); + scalar maxCo(pimpleDict.lookup("maxCo")); // Maximum time scale scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", great)); diff --git a/applications/solvers/multiphase/VoF/alphaCourantNo.H b/applications/solvers/multiphase/VoF/alphaCourantNo.H index 89c6d2bb38..3d5f194f40 100644 --- a/applications/solvers/multiphase/VoF/alphaCourantNo.H +++ b/applications/solvers/multiphase/VoF/alphaCourantNo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description scalar maxAlphaCo ( - readScalar(runTime.controlDict().lookup("maxAlphaCo")) + runTime.controlDict().lookup("maxAlphaCo") ); scalar alphaCoNum = 0.0; diff --git a/applications/solvers/multiphase/cavitatingFoam/createControls.H b/applications/solvers/multiphase/cavitatingFoam/createControls.H index d47cf78b5a..7874c0e87d 100644 --- a/applications/solvers/multiphase/cavitatingFoam/createControls.H +++ b/applications/solvers/multiphase/cavitatingFoam/createControls.H @@ -2,5 +2,5 @@ scalar maxAcousticCo ( - readScalar(runTime.controlDict().lookup("maxAcousticCo")) + runTime.controlDict().lookup("maxAcousticCo") ); diff --git a/applications/solvers/multiphase/cavitatingFoam/readControls.H b/applications/solvers/multiphase/cavitatingFoam/readControls.H index 84ef52ce65..c7b6b30ba4 100644 --- a/applications/solvers/multiphase/cavitatingFoam/readControls.H +++ b/applications/solvers/multiphase/cavitatingFoam/readControls.H @@ -1,3 +1,3 @@ #include "readDyMControls.H" -maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo")); +maxAcousticCo = runTime.controlDict().lookup("maxAcousticCo"); diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C index 17ff6eb4d6..07d9612bf3 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C @@ -892,7 +892,7 @@ void Foam::multiphaseMixtureThermo::solve() const dictionary& alphaControls = mesh_.solverDict("alpha"); label nAlphaSubCycles(alphaControls.lookup