From 146a59e46c591fc3b5294b515a06c2befec75f1f Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 20 Dec 2018 11:00:37 +0000 Subject: [PATCH] GeometricField: Temporary fields are no longer registered on the database by default Registration occurs when the temporary field is transferred to a non-temporary field via a constructor or if explicitly transferred to the database via the regIOobject "store" methods. --- .../basic/potentialFoam/createFields.H | 2 +- .../basic/potentialFoam/potentialFoam.C | 2 +- .../basicXiSubXiEq/basicXiSubXiEq.C | 4 +- .../PDRModels/dragModels/basic/basic.C | 2 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +- .../XiModels/XiEqModels/Gulder/Gulder.C | 2 +- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 2 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.C | 4 +- .../solvers/combustion/PDRFoam/createFields.H | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 8 +- applications/solvers/combustion/XiFoam/bEqn.H | 8 +- .../solvers/combustion/XiFoam/createFields.H | 2 +- .../combustion/chemFoam/createBaseFields.H | 6 +- .../combustion/chemFoam/createFields.H | 3 +- .../chemFoam/readInitialConditions.H | 2 +- .../combustion/coldEngineFoam/createFields.H | 2 +- .../combustion/fireFoam/createFields.H | 4 +- .../combustion/reactingFoam/createFields.H | 4 +- .../rhoReactingBuoyantFoam/createFields.H | 4 +- .../rhoReactingFoam/createFields.H | 4 +- .../combustion/reactingFoam/setRDeltaT.H | 2 +- .../rhoCentralFoam/createFields.H | 4 +- .../compressible/rhoCentralFoam/setRDeltaT.H | 2 +- .../compressible/rhoPimpleFoam/createFields.H | 2 +- .../compressible/rhoPimpleFoam/setRDeltaT.H | 2 +- .../magneticFoam/createFields.H | 2 +- .../financial/financialFoam/createFields.H | 2 +- .../buoyantPimpleFoam/createFields.H | 2 +- .../chtMultiRegionFoam/fluid/YEqn.H | 2 +- .../fluid/createFluidFields.H | 3 +- .../solid/createSolidFields.H | 2 +- .../heatTransfer/thermoFoam/createFields.H | 2 +- .../heatTransfer/thermoFoam/setAlphaEff.H | 2 +- .../boundaryFoam/createFields.H | 2 +- .../shallowWaterFoam/createFields.H | 2 +- .../solvers/lagrangian/DPMFoam/createFields.H | 2 +- .../coalChemistryFoam/createFields.H | 8 +- .../reactingParcelFoam/createFields.H | 4 +- .../simpleReactingParcelFoam/createFields.H | 2 +- .../lagrangian/sprayFoam/createFields.H | 4 +- .../solvers/multiphase/VoF/alphaEqn.H | 2 +- .../solvers/multiphase/VoF/alphaEqnSubCycle.H | 2 +- .../solvers/multiphase/VoF/setRDeltaT.H | 2 +- .../multiphase/cavitatingFoam/correctPhi.H | 2 +- .../compressibleInterFoam/alphaSuSp.H | 4 +- .../compressibleAlphaEqnSubCycle.H | 4 +- .../VoFSolidificationMeltingSource.C | 2 +- .../multiphaseMixtureThermo.C | 21 +-- .../phaseModel/phaseModel.C | 2 +- .../driftFluxFoam/alphaEqnSubCycle.H | 4 +- ...incompressibleTwoPhaseInteractingMixture.C | 2 +- .../multiphase/interFoam/initCorrectPhi.H | 4 +- .../interMixingFoam/alphaEqnSubCycle.H | 2 +- .../incompressibleThreePhaseMixture.C | 2 +- .../threePhaseInterfaceProperties.C | 4 +- .../interPhaseChangeFoam.C | 2 +- .../multiphase/multiphaseEulerFoam/UEqns.H | 2 +- .../multiphaseEulerFoam/createFields.H | 2 +- .../dragModels/interface/interface.C | 2 +- .../multiphaseSystem/multiphaseSystem.C | 31 +--- .../multiphaseSystem/phaseModel/phaseModel.C | 2 +- .../multiphase/multiphaseEulerFoam/pEqn.H | 6 +- .../multiphaseMixture/multiphaseMixture.C | 21 +-- .../potentialFreeSurfaceFoam.C | 2 +- .../interfaceCompositionModels/Henry/Henry.C | 4 +- .../InterfaceCompositionModel.C | 4 +- .../NonRandomTwoLiquid/NonRandomTwoLiquid.C | 4 +- .../Raoult/Raoult.C | 4 +- .../saturationModels/Antoine/Antoine.C | 4 +- .../AntoineExtended/AntoineExtended.C | 4 +- .../constantSaturationConditions.C | 4 +- .../saturationModels/function1/function1.C | 2 +- .../saturationModels/polynomial/polynomial.C | 2 +- .../dragModels/segregated/segregated.C | 2 +- .../liftModels/noLift/noLift.C | 4 +- .../swarmCorrections/noSwarm/noSwarm.C | 2 +- .../noTurbulentDispersion.C | 2 +- .../noVirtualMass/noVirtualMass.C | 4 +- .../wallLubricationModels/Antal/Antal.C | 2 +- .../wallLubricationModels/Frank/Frank.C | 2 +- ...terfaceCompositionPhaseChangePhaseSystem.C | 8 +- .../MomentumTransferPhaseSystem.C | 6 +- .../PhaseTransferPhaseSystem.C | 2 +- .../PopulationBalancePhaseSystem.C | 2 +- .../ThermalPhaseChangePhaseSystem.C | 8 +- .../TwoResistanceHeatTransferPhaseSystem.C | 2 +- .../velocityGroup/velocityGroup.C | 8 +- .../InertPhaseModel/InertPhaseModel.C | 2 +- .../MovingPhaseModel/MovingPhaseModel.C | 8 +- .../MultiComponentPhaseModel.C | 2 +- .../phaseModel/phaseModel/phaseModel.C | 2 +- .../phaseSystems/phaseSystem/phaseSystem.C | 8 +- .../driftModels/constantDrift/constantDrift.C | 2 +- .../driftModels/phaseChange/phaseChange.C | 4 +- .../populationBalanceModel.C | 22 +-- .../multiphaseSystem/multiphaseSystem.C | 19 +-- .../reactingMultiphaseEulerFoam/pU/pEqn.H | 4 +- .../reactingMultiphaseEulerFoam/pUf/pEqn.H | 4 +- .../reactingMultiphaseEulerFoam/setRDeltaT.H | 2 +- .../pUf/createRDeltaTf.H | 2 +- .../reactingTwoPhaseEulerFoam/setRDeltaT.H | 2 +- .../JohnsonJacksonFrictionalStress.C | 2 +- .../JohnsonJacksonSchaefferFrictionalStress.C | 2 +- .../Schaeffer/SchaefferFrictionalStress.C | 6 +- .../kineticTheoryModel/kineticTheoryModel.C | 8 +- .../phasePressureModel/phasePressureModel.C | 2 +- .../IATE/IATEsources/dummy/dummy.C | 2 +- .../randomCoalescence/randomCoalescence.C | 2 +- .../turbulentBreakUp/turbulentBreakUp.C | 2 +- .../IATEsources/wallBoiling/wallBoiling.C | 4 +- .../twoPhaseSystem/twoPhaseSystem.C | 2 +- .../twoLiquidMixingFoam/alphaEqnSubCycle.H | 2 +- .../twoPhaseEulerFoam/createFields.H | 2 +- .../dragModels/segregated/segregated.C | 2 +- .../liftModels/noLift/noLift.C | 4 +- .../swarmCorrections/noSwarm/noSwarm.C | 2 +- .../noTurbulentDispersion.C | 2 +- .../noVirtualMass/noVirtualMass.C | 4 +- .../wallLubricationModels/Antal/Antal.C | 2 +- .../wallLubricationModels/Frank/Frank.C | 2 +- .../JohnsonJacksonFrictionalStress.C | 2 +- .../JohnsonJacksonSchaefferFrictionalStress.C | 2 +- .../Schaeffer/SchaefferFrictionalStress.C | 6 +- .../kineticTheoryModel/kineticTheoryModel.C | 8 +- .../phasePressureModel/phasePressureModel.C | 2 +- .../BlendedInterfacialModel.C | 8 +- .../blendingMethods/noBlending/noBlending.C | 2 - .../IATE/IATEsources/dummy/dummy.C | 2 +- .../randomCoalescence/randomCoalescence.C | 2 +- .../turbulentBreakUp/turbulentBreakUp.C | 2 +- .../twoPhaseSystem/phaseModel/phaseModel.C | 6 +- .../twoPhaseSystem/twoPhaseSystem.C | 4 +- .../readMechanicalProperties.H | 3 - .../readThermalProperties.H | 7 +- .../Test-GAMGAgglomeration.C | 4 +- .../Test-PatchEdgeFaceWave.C | 4 +- .../test/PointEdgeWave/Test-PointEdgeWave.C | 2 +- .../fieldDependency/Test-fieldDependency.C | 4 +- .../test/fieldMapping/Test-fieldMapping.C | 4 +- applications/test/hexRef8/Test-hexRef8.C | 6 +- applications/test/volField/Test-volField.C | 2 +- .../refinementLevel/refinementLevel.C | 2 +- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 4 +- .../backgroundMeshDecomposition.C | 2 +- .../conformalVoronoiMeshIO.C | 10 +- .../conformalVoronoiMeshTemplates.C | 2 +- .../foamyHexMeshBackgroundMesh.C | 4 +- .../manipulation/renumberMesh/renumberMesh.C | 2 +- .../splitMeshRegions/splitMeshRegions.C | 2 +- .../decomposePar/decomposePar.C | 2 +- .../reconstructParMesh/reconstructParMesh.C | 2 +- .../applyBoundaryLayer/createFields.H | 2 +- .../faceAgglomerate/faceAgglomerate.C | 2 +- .../preProcessing/setWaves/setWaves.C | 4 +- .../viewFactorsGen/viewFactorsGen.C | 2 +- src/OpenFOAM/db/regIOobject/regIOobject.H | 2 + src/OpenFOAM/db/regIOobject/regIOobjectI.H | 3 + .../GeometricField/GeometricField.C | 30 ++-- .../GeometricField/GeometricFieldFunctions.C | 143 ++++-------------- .../GeometricField/GeometricFieldFunctionsM.C | 88 ++--------- .../GeometricFieldReuseFunctions.H | 105 ++++--------- .../GeometricField/uniformInterpolate.C | 13 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.C | 2 +- .../RAS/kkLOmega/kkLOmega.C | 6 +- .../Base/kOmegaSST/kOmegaSSTBase.C | 2 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.C | 2 +- .../LESfilters/laplaceFilter/laplaceFilter.C | 4 +- .../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 6 +- .../SpalartAllmarasDES/SpalartAllmarasDES.C | 4 +- .../SpalartAllmarasIDDES.C | 4 +- .../LES/dynamicKEqn/dynamicKEqn.C | 6 +- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 4 +- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 2 +- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 2 +- .../RAS/realizableKE/realizableKE.C | 2 +- .../turbulenceModels/RAS/v2f/v2f.C | 4 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../Casson/Casson.C | 2 +- .../powerLaw/powerLaw.C | 4 +- .../kEpsilonLopesdaCosta.C | 10 +- src/combustionModels/EDC/EDC.C | 2 +- src/combustionModels/FSD/FSD.C | 23 ++- .../consumptionSpeed/consumptionSpeed.C | 1 - src/combustionModels/PaSR/PaSR.C | 2 +- src/combustionModels/diffusion/diffusion.C | 2 +- .../infinitelyFastChemistry.C | 2 +- .../noCombustion/noCombustion.C | 2 +- .../singleStepCombustion.C | 2 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 2 +- .../motionSmoother/motionSmootherData.C | 4 +- .../displacementLayeredMotionMotionSolver.C | 2 +- .../interpolatingSolidBodyMotionSolver.C | 2 +- .../pointPatchDist/pointPatchDist.C | 2 +- .../polyTopoChange/hexRef8/hexRef8.C | 6 +- .../polyTopoChange/hexRef8/hexRef8Data.C | 2 +- .../cfdTools/general/CorrectPhi/CorrectPhi.C | 4 +- .../general/fvOptions/fvOptionListTemplates.C | 2 +- .../cfdTools/general/include/createRDeltaT.H | 2 +- .../cfdTools/general/include/readhRef.H | 2 +- .../cfdTools/general/include/readpRef.H | 2 +- .../finiteVolume/fvm/fvmLaplacian.C | 4 +- .../limitedSnGrad/limitedSnGrad.C | 4 +- .../fvMatrices/fvMatrix/fvMatrix.C | 2 +- src/finiteVolume/fvMesh/fvMeshGeometry.C | 4 +- .../Poisson/PoissonPatchDistMethod.C | 4 +- .../advectionDiffusionPatchDistMethod.C | 2 +- .../meshWave/meshWavePatchDistMethod.C | 4 +- .../meshWave/wallDistData/wallDistData.C | 2 +- .../limitedSchemes/blended/blended.H | 14 +- .../limitedSchemes/upwind/upwind.H | 2 +- .../schemes/cellCoBlended/cellCoBlended.H | 2 +- .../schemes/midPoint/midPoint.H | 2 +- .../volPointInterpolate.C | 2 +- .../volPointInterpolation.C | 2 +- .../field/CourantNo/CourantNo.C | 2 +- src/functionObjects/field/age/age.C | 4 +- .../regionSizeDistribution.C | 2 +- .../field/streamFunction/streamFunction.C | 2 +- .../turbulenceIntensity/turbulenceIntensity.C | 2 +- .../field/wallHeatFlux/wallHeatFlux.C | 2 +- .../wallHeatTransferCoeff.C | 1 - src/functionObjects/field/yPlus/yPlus.C | 2 +- src/functionObjects/forces/forces/forces.C | 2 +- ...lacementComponentLaplacianFvMotionSolver.C | 7 +- ...velocityComponentLaplacianFvMotionSolver.C | 7 +- .../motionDirectionalDiffusivity.C | 2 +- .../uniform/uniformDiffusivity.C | 2 +- .../derived/rotorDiskSource/rotorDiskSource.C | 2 +- .../solidificationMeltingSource.C | 3 +- .../interRegionExplicitPorositySource.C | 4 +- .../interRegionHeatTransferModel.C | 3 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 36 ++--- .../coalCloudList/coalCloudListI.H | 8 +- .../Templates/KinematicCloud/KinematicCloud.C | 2 +- .../KinematicCloud/KinematicCloudI.H | 8 +- .../Templates/ReactingCloud/ReactingCloud.C | 2 +- .../Templates/ReactingCloud/ReactingCloudI.H | 10 +- .../Templates/ThermoCloud/ThermoCloud.C | 15 +- .../Templates/ThermoCloud/ThermoCloudI.H | 6 +- .../ParticleErosion/ParticleErosion.C | 2 +- .../VoidFraction/VoidFraction.C | 2 +- .../LocalInteraction/LocalInteraction.C | 4 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 6 +- .../cloudAbsorptionEmission.C | 6 +- .../scatter/cloudScatter/cloudScatter.C | 2 +- .../medialAxisMeshMover.C | 6 +- .../meshRefinement/meshRefinement.C | 4 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 6 +- .../snappyHexMeshDriver/snappySnapDriver.C | 2 +- .../reactingOneDim/reactingOneDim.C | 30 ++-- .../regionModel/regionModel1D/regionModel1D.C | 2 +- .../singleLayerRegion/singleLayerRegion.C | 2 +- .../kinematicSingleLayer.C | 50 +++--- .../surfaceFilmModels/noFilm/noFilm.C | 6 +- .../constantFilmThermo/constantFilmThermo.C | 10 +- .../liquidFilmThermo/liquidFilmThermo.C | 10 +- .../filmTurbulenceModel/laminar/laminar.C | 2 +- .../contactAngleForce/contactAngleForce.C | 6 +- .../distributionContactAngleForce.C | 2 +- ...bedTemperatureDependentContactAngleForce.C | 2 +- .../temperatureDependentContactAngleForce.C | 2 +- .../curvatureSeparation/curvatureSeparation.C | 4 +- .../constantRadiation/constantRadiation.C | 4 +- .../noRadiation/noRadiation.C | 2 +- .../primaryRadiation/primaryRadiation.C | 4 +- .../standardRadiation/standardRadiation.C | 6 +- .../thixotropicViscosity.C | 2 +- .../waxSolventViscosity/waxSolventViscosity.C | 4 +- .../constantHeatTransfer.C | 1 - .../mappedConvectiveHeatTransfer.C | 2 +- .../solidification/solidification.C | 4 +- .../waxSolventEvaporation.C | 6 +- .../thermoSingleLayer/thermoSingleLayer.C | 33 ++-- .../thermalBaffleModels/noThermo/noThermo.C | 2 +- .../thermalBaffle/thermalBaffle.C | 30 +--- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 2 +- .../distanceSurface/distanceSurface.C | 4 +- .../sampledCuttingPlane/sampledCuttingPlane.C | 4 +- .../sixDoFRigidBodyMotionSolver.C | 2 +- .../basic/basicThermo/basicThermo.C | 14 +- .../StandardChemistryModel.C | 8 +- .../basicChemistryModel/basicChemistryModel.C | 2 +- .../laminarFlameSpeed/Gulders/Gulders.C | 4 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 4 +- .../RaviPetersen/RaviPetersen.C | 4 +- .../radiation/radiationModels/P1/P1.C | 16 +- .../blackBodyEmission/blackBodyEmission.C | 2 +- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 26 ++-- .../radiativeIntensityRay.C | 10 +- .../radiationModels/noRadiation/noRadiation.C | 8 +- .../radiationModels/opaqueSolid/opaqueSolid.C | 8 +- .../radiationModels/viewFactor/viewFactor.C | 5 +- .../absorptionEmissionModel.C | 12 +- .../greyMeanAbsorptionEmission.C | 4 +- .../greyMeanSolidAbsorptionEmission.C | 2 +- .../wideBandAbsorptionEmission.C | 6 +- .../scatterModel/noScatter/noScatter.C | 2 +- .../moleFractions/moleFractions.C | 2 +- .../pyrolysisChemistryModel.C | 4 +- .../pyrolysisChemistryModelI.H | 2 +- .../solidChemistryModel/solidChemistryModel.C | 4 +- .../solidChemistryModelI.H | 2 +- .../incompressibleTwoPhaseMixture.C | 2 +- .../viscosityModels/Casson/Casson.C | 2 +- .../viscosityModels/powerLaw/powerLaw.C | 4 +- .../interfaceProperties/interfaceProperties.C | 4 +- 307 files changed, 707 insertions(+), 1042 deletions(-) diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H index 40db86dacf..8d16dce62a 100644 --- a/applications/solvers/basic/potentialFoam/createFields.H +++ b/applications/solvers/basic/potentialFoam/createFields.H @@ -98,7 +98,7 @@ volScalarField Phi IOobject::NO_WRITE ), mesh, - dimensionedScalar("Phi", dimLength*dimVelocity, 0), + dimensionedScalar(dimLength*dimVelocity, 0), PhiBCTypes ); diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 479a445553..fe19cf0cc8 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) { fvScalarMatrix PhiEqn ( - fvm::laplacian(dimensionedScalar("1", dimless, 1), Phi) + fvm::laplacian(dimensionedScalar(dimless, 1), Phi) == fvc::div(phi) ); diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 29973e2b5e..5a99f89d1b 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -87,7 +87,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const volScalarField magU(mag(U)); volVectorField Uhat ( - U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) + U/(mag(U) + dimensionedScalar(U.dimensions(), 1e-4)) ); const scalarField Cw = pow(mesh.V(), 2.0/3.0); @@ -103,7 +103,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", Nv.dimensions(), 0) + dimensionedScalar(Nv.dimensions(), 0) ); N.primitiveFieldRef() = Nv.primitiveField()*Cw; diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C index 7656abfafd..6f476b2fd1 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C @@ -143,7 +143,7 @@ Foam::tmp Foam::PDRDragModels::basic::Gk() const IOobject::NO_WRITE ), U_.mesh(), - dimensionedScalar("zero", dimMass/dimLength/pow(dimTime, 3), 0) + dimensionedScalar(dimMass/dimLength/pow(dimTime, 3), 0) ) ); diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 0369875c54..862bc47386 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -146,7 +146,7 @@ void PDRkEpsilon::correct() volScalarField GR(drag.Gk()); volScalarField LI - (C4_*(Lobs + dimensionedScalar("minLength", dimLength, rootVSmall))); + (C4_*(Lobs + dimensionedScalar(dimLength, rootVSmall))); // Dissipation equation tmp epsEqn diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 02b32e1a7e..2e74ee61dd 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -84,7 +84,7 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const up / ( sqrt(epsilon*tauEta) - + dimensionedScalar("1e-8", up.dimensions(), 1e-8) + + dimensionedScalar(up.dimensions(), 1e-8) ) ); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 1130e09985..117e09383a 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -105,7 +105,7 @@ Foam::tmp Foam::XiEqModels::SCOPEXiEq::XiEq() const IOobject::NO_WRITE ), epsilon.mesh(), - dimensionedScalar("XiEq", dimless, 0) + dimensionedScalar(dimless, 0) ) ); volScalarField& xieq = tXiEq.ref(); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index a63d71e615..da962d63e4 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -110,7 +110,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const false ), mesh, - dimensionedScalar("zero", Nv.dimensions(), 0) + dimensionedScalar(Nv.dimensions(), 0) ) ); volScalarField& N = tN.ref(); @@ -138,7 +138,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const const volVectorField Uhat ( - U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) + U/(mag(U) + dimensionedScalar(U.dimensions(), 1e-4)) ); const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4)))); diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index ebbfbbf83c..6134f45c5c 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -68,7 +68,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 6870258bcb..861a4a3af0 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -255,7 +255,7 @@ Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi IOobject::NO_WRITE ), p.mesh(), - dimensionedScalar("Su0", dimVelocity, 0) + dimensionedScalar(dimVelocity, 0) ) ); @@ -304,7 +304,7 @@ Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi IOobject::NO_WRITE ), p.mesh(), - dimensionedScalar("Su0", dimVelocity, 0) + dimensionedScalar(dimVelocity, 0) ) ); @@ -358,7 +358,7 @@ Foam::tmp Foam::laminarFlameSpeedModels::SCOPE::Ma IOobject::NO_WRITE ), phi.mesh(), - dimensionedScalar("Ma", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -418,7 +418,7 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const IOobject::NO_WRITE ), mesh, - dimensionedScalar("Ma", dimless, Ma(equivalenceRatio_)) + dimensionedScalar(dimless, Ma(equivalenceRatio_)) ) ); } diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H index dba663cc9b..2d8c0b7a9a 100644 --- a/applications/solvers/combustion/XiFoam/bEqn.H +++ b/applications/solvers/combustion/XiFoam/bEqn.H @@ -18,7 +18,7 @@ if (ign.ignited()) dimensionedScalar dMgb = 1.0e-3* (b*c*mgb)().weightedAverage(mesh.V()) /((b*c)().weightedAverage(mesh.V()) + small) - + dimensionedScalar("ddMgb", mgb.dimensions(), small); + + dimensionedScalar(mgb.dimensions(), small); mgb += dMgb; @@ -91,12 +91,12 @@ if (ign.ignited()) up / ( sqrt(epsilon*tauEta) - + dimensionedScalar("1e-8", up.dimensions(), 1e-8) + + dimensionedScalar(up.dimensions(), 1e-8) ) ); // volScalarField l = 0.337*k*sqrt(k)/epsilon; - // Reta *= max((l - dimensionedScalar("dl", dimLength, 1.5e-3))/l, 0); + // Reta *= max((l - dimensionedScalar(dimLength, 1.5e-3))/l, 0); // Calculate Xi flux // ~~~~~~~~~~~~~~~~~ @@ -243,7 +243,7 @@ if (ign.ignited()) rho*max ( sigmat - sigmas, - dimensionedScalar("0", sigmat.dimensions(), 0) + dimensionedScalar(sigmat.dimensions(), 0) ), Xi ) diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 7ca44da924..d83ea841ff 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -68,7 +68,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/combustion/chemFoam/createBaseFields.H b/applications/solvers/combustion/chemFoam/createBaseFields.H index 80dea2584b..726ee9fcea 100644 --- a/applications/solvers/combustion/chemFoam/createBaseFields.H +++ b/applications/solvers/combustion/chemFoam/createBaseFields.H @@ -15,7 +15,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl; false ), mesh, - dimensionedScalar("Ydefault", dimless, 1) + dimensionedScalar(dimless, 1) ); Ydefault.write(); @@ -32,7 +32,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl; false ), mesh, - dimensionedScalar("p", dimPressure, p0) + dimensionedScalar(dimPressure, p0) ); p.write(); @@ -49,7 +49,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl; false ), mesh, - dimensionedScalar("T", dimTemperature, T0) + dimensionedScalar(dimTemperature, T0) ); T.write(); diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index b0baa21d01..bb179c3e46 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -59,9 +59,8 @@ mesh, dimensionedScalar ( - "zero", dimensionSet(dimEnergy/dimMass/dimTemperature), - 0.0 + 0 ) ); diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index 16825fdc84..5372ff1740 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -85,7 +85,7 @@ Y[i] = Y0[i]; } - thermo.he() = dimensionedScalar("h", dimEnergy/dimMass, h0); + thermo.he() = dimensionedScalar(dimEnergy/dimMass, h0); thermo.correct(); rho = thermo.rho(); diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 0f3fe325dd..9e6f937709 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -61,7 +61,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 2beda26652..dff9693969 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -135,7 +135,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); @@ -149,7 +149,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index 8e903460bd..d28460ff8a 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -77,7 +77,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -103,7 +103,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index f527d4be4a..9db3cc2fd2 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -99,7 +99,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -125,7 +125,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 74ce2ad53e..d0a9775837 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -81,7 +81,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -107,7 +107,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H index 524d648627..e546e919c5 100644 --- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H +++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H @@ -104,7 +104,7 @@ License mesh ), mesh, - dimensionedScalar("rDeltaTY", rDeltaT.dimensions(), 0) + dimensionedScalar(rDeltaT.dimensions(), 0) ); bool foundY = false; diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index b7cbdd067f..4f8be91d64 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -72,7 +72,7 @@ surfaceScalarField pos mesh ), mesh, - dimensionedScalar("pos", dimless, 1.0) + dimensionedScalar(dimless, 1.0) ); surfaceScalarField neg @@ -84,7 +84,7 @@ surfaceScalarField neg mesh ), mesh, - dimensionedScalar("neg", dimless, -1.0) + dimensionedScalar(dimless, -1.0) ); surfaceScalarField phi("phi", fvc::flux(rhoU)); diff --git a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H index 4ad54b23ba..540a3f4c92 100644 --- a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H +++ b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H @@ -13,7 +13,7 @@ // Set the reciprocal time-step from the local Courant number rDeltaT.ref() = max ( - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + 1/dimensionedScalar(dimTime, maxDeltaT), fvc::surfaceSum(amaxSf)()() /((2*maxCo)*mesh.V()) ); diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 8561a96d8c..c6c50baab6 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -66,7 +66,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H index 4f8019a941..074d05e3db 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H @@ -28,7 +28,7 @@ // Set the reciprocal time-step from the local Courant number rDeltaT.ref() = max ( - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + 1/dimensionedScalar(dimTime, maxDeltaT), fvc::surfaceSum(mag(phi))()() /((2*maxCo)*mesh.V()*rho()) ); diff --git a/applications/solvers/electromagnetics/magneticFoam/createFields.H b/applications/solvers/electromagnetics/magneticFoam/createFields.H index 22d4008921..530cf92834 100644 --- a/applications/solvers/electromagnetics/magneticFoam/createFields.H +++ b/applications/solvers/electromagnetics/magneticFoam/createFields.H @@ -49,7 +49,7 @@ mesh ), mesh, - dimensionedScalar("Mr", dimensionSet(0, 1, 0, 0, 0, 1, 0), 0) + dimensionedScalar(dimensionSet(0, 1, 0, 0, 0, 1, 0), 0) ); forAll(magnets, i) diff --git a/applications/solvers/financial/financialFoam/createFields.H b/applications/solvers/financial/financialFoam/createFields.H index dd998bc1e2..5f1fd2061d 100644 --- a/applications/solvers/financial/financialFoam/createFields.H +++ b/applications/solvers/financial/financialFoam/createFields.H @@ -82,7 +82,7 @@ volVectorField P V == max ( P.component(Foam::vector::X) - strike, - dimensionedScalar("0", V.dimensions(), 0) + dimensionedScalar(V.dimensions(), 0) ); volScalarField delta diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index a2745bf87e..c02049b005 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -98,7 +98,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H index f532b95fc9..76af5918bf 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H @@ -27,7 +27,7 @@ if (Y.size()) ( IOobject("Yt", runTime.timeName(), mesh), mesh, - dimensionedScalar("Yt", dimless, 0) + dimensionedScalar(dimless, 0) ) ); } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index f8f8c66382..fc31a93e8b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -116,7 +116,7 @@ forAll(fluidRegions, i) IOobject::READ_IF_PRESENT, IOobject::NO_WRITE ), - dimensionedScalar("hRef", dimLength, 0) + dimensionedScalar(dimLength, 0) ) ); @@ -225,7 +225,6 @@ forAll(fluidRegions, i) fluidRegions[i], dimensionedScalar ( - "dpdt", thermoFluid[i].p().dimensions()/dimTime, 0 ) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index a65afcb022..1f164488cb 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -100,7 +100,7 @@ forAll(solidRegions, i) IOobject::NO_WRITE ), solidRegions[i], - dimensionedScalar("1", dimless, scalar(1)) + dimensionedScalar(dimless, scalar(1)) ) ); } diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index 524f54ee9b..59687c1d0e 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -47,7 +47,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H index c19cfaa1fe..56a44c2ecd 100644 --- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H +++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H @@ -41,7 +41,7 @@ else IOobject::NO_WRITE ), mesh, - dimensionedScalar("0", dimMass/dimLength/dimTime, 0) + dimensionedScalar(dimMass/dimLength/dimTime, 0) ) ); } diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index b8c35ef21d..fa8c08975f 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -25,7 +25,7 @@ surfaceScalarField phi IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", mesh.Sf().dimensions()*U.dimensions(), 0) + dimensionedScalar(mesh.Sf().dimensions()*U.dimensions(), 0) ); diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H index 06c6ae6b16..a6f31de91f 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H +++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H @@ -25,7 +25,7 @@ const volScalarField h0 IOobject::READ_IF_PRESENT ), mesh, - dimensionedScalar("h0", dimLength, 0) + dimensionedScalar(dimLength, 0) ); Info<< "Creating field hU\n" << endl; diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index 32f75cf618..8b94c7b6da 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -119,7 +119,7 @@ volScalarField alphac IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("0", dimless, 0) + dimensionedScalar(dimless, 0) ); word kinematicCloudName("kinematicCloud"); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index bc45ddec13..ded161c1ad 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -58,7 +58,7 @@ volScalarField rhoEffLagrangian IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("zero", dimDensity, 0) + dimensionedScalar(dimDensity, 0) ); // dynamic pressure field - used externally (optional) @@ -73,7 +73,7 @@ volScalarField pDyn IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("zero", dimPressure, 0) + dimensionedScalar(dimPressure, 0) ); @@ -123,7 +123,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -140,7 +140,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 0a0a348264..e94befd74a 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -77,7 +77,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -128,7 +128,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index a85480c326..c16c63f2b4 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -110,7 +110,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 4cfa395eda..ba25dea1f3 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -102,7 +102,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); Info<< "Creating field kinetic energy K\n" << endl; @@ -126,7 +126,7 @@ volScalarField Qdot IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); #include "createMRF.H" diff --git a/applications/solvers/multiphase/VoF/alphaEqn.H b/applications/solvers/multiphase/VoF/alphaEqn.H index a9a959fe45..dcaec2df28 100644 --- a/applications/solvers/multiphase/VoF/alphaEqn.H +++ b/applications/solvers/multiphase/VoF/alphaEqn.H @@ -113,7 +113,7 @@ phiCN, upwind(mesh, phiCN) ).fvmDiv(phiCN, alpha1) - // - fvm::Sp(fvc::ddt(dimensionedScalar("1", dimless, 1), mesh) + // - fvm::Sp(fvc::ddt(dimensionedScalar(dimless, 1), mesh) // + fvc::div(phiCN), alpha1) == Su + fvm::Sp(Sp + divU, alpha1) diff --git a/applications/solvers/multiphase/VoF/alphaEqnSubCycle.H b/applications/solvers/multiphase/VoF/alphaEqnSubCycle.H index 772de0b97a..347b7f4b97 100644 --- a/applications/solvers/multiphase/VoF/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/VoF/alphaEqnSubCycle.H @@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1) mesh ), mesh, - dimensionedScalar("0", rhoPhi.dimensions(), 0) + dimensionedScalar(rhoPhi.dimensions(), 0) ); tmp trSubDeltaT; diff --git a/applications/solvers/multiphase/VoF/setRDeltaT.H b/applications/solvers/multiphase/VoF/setRDeltaT.H index 5254a98cf6..5425c669f5 100644 --- a/applications/solvers/multiphase/VoF/setRDeltaT.H +++ b/applications/solvers/multiphase/VoF/setRDeltaT.H @@ -58,7 +58,7 @@ // Set the reciprocal time-step from the local Courant number rDeltaT.ref() = max ( - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + 1/dimensionedScalar(dimTime, maxDeltaT), fvc::surfaceSum(mag(rhoPhi))()() /((2*maxCo)*mesh.V()*rho()) ); diff --git a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H index dd73c0f286..461cb90d8f 100644 --- a/applications/solvers/multiphase/cavitatingFoam/correctPhi.H +++ b/applications/solvers/multiphase/cavitatingFoam/correctPhi.H @@ -12,7 +12,7 @@ correctUphiBCs(U, phi); IOobject::NO_WRITE ), mesh, - dimensionedScalar("pcorr", p.dimensions(), 0), + dimensionedScalar(p.dimensions(), 0), pcorrTypes ); diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H index 12d2bcfbd7..1e5fa3de4b 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H +++ b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H @@ -7,7 +7,7 @@ volScalarField::Internal Sp mesh ), mesh, - dimensionedScalar("Sp", dgdt.dimensions(), 0) + dimensionedScalar(dgdt.dimensions(), 0) ); volScalarField::Internal Su @@ -19,7 +19,7 @@ volScalarField::Internal Su mesh ), mesh, - dimensionedScalar("Su", dgdt.dimensions(), 0) + dimensionedScalar(dgdt.dimensions(), 0) ); forAll(dgdt, celli) diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H index 006b26317e..f7cf0188d9 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H @@ -13,7 +13,7 @@ if (nAlphaSubCycles > 1) mesh ), mesh, - dimensionedScalar("0", alphaPhi10.dimensions(), 0) + dimensionedScalar(alphaPhi10.dimensions(), 0) ); surfaceScalarField rhoPhiSum @@ -25,7 +25,7 @@ if (nAlphaSubCycles > 1) mesh ), mesh, - dimensionedScalar("0", rhoPhi.dimensions(), 0) + dimensionedScalar(rhoPhi.dimensions(), 0) ); tmp trSubDeltaT; diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C index 3a1a4de609..535f1bdd75 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C @@ -136,7 +136,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("alpha1", dimless, 0), + dimensionedScalar(dimless, 0), zeroGradientFvPatchScalarField::typeName ), curTimeIndex_(-1) diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C index fc1e2f5d80..1b8af455cf 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C @@ -88,7 +88,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo IOobject::NO_WRITE ), mesh_, - dimensionedScalar("rhoPhi", dimMass/dimTime, 0) + dimensionedScalar(dimMass/dimTime, 0) ), alphas_ @@ -102,7 +102,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("alphas", dimless, 0) + dimensionedScalar(dimless, 0) ), sigmas_(lookup("sigmas")), @@ -779,12 +779,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const mesh_ ), mesh_, - dimensionedScalar - ( - "surfaceTensionForce", - dimensionSet(1, -2, -2, 0, 0), - 0.0 - ) + dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), 0) ) ); @@ -812,7 +807,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const << exit(FatalError); } - stf += dimensionedScalar("sigma", dimSigma_, sigma()) + stf += dimensionedScalar(dimSigma_, sigma()) *fvc::interpolate(K(alpha1, alpha2))* ( fvc::interpolate(alpha2)*fvc::snGrad(alpha1) @@ -1035,7 +1030,7 @@ Foam::multiphaseMixtureThermo::nearInterface() const mesh_ ), mesh_, - dimensionedScalar("nearInterface", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -1122,7 +1117,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas MULES::limitSum(alphaPhiCorrs); - rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0); + rhoPhi_ = dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), 0); volScalarField sumAlpha ( @@ -1133,7 +1128,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas mesh_ ), mesh_, - dimensionedScalar("sumAlpha", dimless, 0) + dimensionedScalar(dimless, 0) ); @@ -1158,7 +1153,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas mesh_ ), mesh_, - dimensionedScalar("Sp", alpha.dgdt().dimensions(), 0) + dimensionedScalar(alpha.dgdt().dimensions(), 0) ); volScalarField::Internal Su diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C index e78fc93612..7f75ad869a 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C @@ -61,7 +61,7 @@ Foam::phaseModel::phaseModel IOobject::AUTO_WRITE ), p.mesh(), - dimensionedScalar("0", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ) { { diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H index 8561b2ba55..d7b58a0f09 100644 --- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H @@ -8,7 +8,7 @@ mesh ), mesh, - dimensionedScalar("0", phi.dimensions(), 0) + dimensionedScalar(phi.dimensions(), 0) ); surfaceScalarField phir(fvc::flux(UdmModel.Udm())); @@ -25,7 +25,7 @@ mesh ), mesh, - dimensionedScalar("0", phi.dimensions(), 0) + dimensionedScalar(phi.dimensions(), 0) ); for diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C index a1976e8021..fc4e909afa 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C @@ -102,7 +102,7 @@ incompressibleTwoPhaseInteractingMixture U_.db() ), U_.mesh(), - dimensionedScalar("mu", dimensionSet(1, -1, -1, 0, 0), 0), + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), 0), calculatedFvPatchScalarField::typeName ) { diff --git a/applications/solvers/multiphase/interFoam/initCorrectPhi.H b/applications/solvers/multiphase/interFoam/initCorrectPhi.H index 9369d91962..7dca181930 100644 --- a/applications/solvers/multiphase/interFoam/initCorrectPhi.H +++ b/applications/solvers/multiphase/interFoam/initCorrectPhi.H @@ -13,7 +13,7 @@ if (correctPhi) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("rAU", dimTime/dimDensity, 1) + dimensionedScalar(dimTime/dimDensity, 1) ); #include "correctPhi.H" @@ -27,7 +27,7 @@ else U, phi, p_rgh, - dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1), + dimensionedScalar(dimTime/rho.dimensions(), 1), geometricZeroField(), pcorrControl ); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H index 99e47ebf81..0a5a81a6aa 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H @@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1) mesh ), mesh, - dimensionedScalar("0", rhoPhi.dimensions(), 0) + dimensionedScalar(rhoPhi.dimensions(), 0) ); for diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C index 7fed49b021..34f6422120 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C @@ -116,7 +116,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture U.db() ), U.mesh(), - dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0), + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0), calculatedFvPatchScalarField::typeName ), diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C index 5428c4a083..d97f0f10ff 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C @@ -186,7 +186,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties mixture.alpha1().mesh() ), mixture.alpha1().mesh(), - dimensionedScalar("nHatf", dimArea, 0) + dimensionedScalar(dimArea, 0) ), K_ @@ -198,7 +198,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties mixture.alpha1().mesh() ), mixture.alpha1().mesh(), - dimensionedScalar("K", dimless/dimLength, 0) + dimensionedScalar(dimless/dimLength, 0) ) { calculateK(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index e15dd8e16a..e563565381 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) mesh ), mesh, - dimensionedScalar("0", dimMass/dimTime, 0) + dimensionedScalar(dimMass/dimTime, 0) ); #include "alphaControls.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H index 5ed343544b..e3b1278641 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H @@ -44,7 +44,7 @@ forAllIter(PtrDictionary, fluid.phases(), iter) *max ( mag(U()) - maxSlamVelocity, - dimensionedScalar("U0", dimVelocity, 0) + dimensionedScalar(dimVelocity, 0) ) /pow(mesh.V(), 1.0/3.0), U diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H index a4b9838335..6e94eecd09 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H @@ -37,7 +37,7 @@ surfaceScalarField phi IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("phi", dimArea*dimVelocity, 0) + dimensionedScalar(dimArea*dimVelocity, 0) ); multiphaseSystem fluid(U, phi); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C index b23c5f0d0c..bd79cba7c1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C @@ -84,7 +84,7 @@ Foam::tmp Foam::dragModels::interface::K false ), Ur.mesh(), - dimensionedScalar("K", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index 6d7a6aa72f..f47581d187 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -151,7 +151,7 @@ void Foam::multiphaseSystem::solveAlphas() mesh_ ), mesh_, - dimensionedScalar("sumAlpha", dimless, 0) + dimensionedScalar(dimless, 0) ); phasei = 0; @@ -401,7 +401,7 @@ Foam::multiphaseSystem::multiphaseSystem IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("alphas", dimless, 0) + dimensionedScalar(dimless, 0) ), sigmas_(lookup("sigmas")), @@ -560,12 +560,7 @@ Foam::tmp Foam::multiphaseSystem::Cvm mesh_ ), mesh_, - dimensionedScalar - ( - "Cvm", - dimensionSet(1, -3, 0, 0, 0), - 0 - ) + dimensionedScalar(dimensionSet(1, -3, 0, 0, 0), 0) ) ); @@ -743,12 +738,7 @@ Foam::tmp Foam::multiphaseSystem::dragCoeff mesh_ ), mesh_, - dimensionedScalar - ( - "dragCoeff", - dimensionSet(1, -3, -1, 0, 0), - 0 - ) + dimensionedScalar(dimensionSet(1, -3, -1, 0, 0), 0) ) ); @@ -791,12 +781,7 @@ Foam::tmp Foam::multiphaseSystem::surfaceTension mesh_ ), mesh_, - dimensionedScalar - ( - "surfaceTension", - dimensionSet(1, -2, -2, 0, 0), - 0 - ) + dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), 0) ) ); @@ -814,7 +799,7 @@ Foam::tmp Foam::multiphaseSystem::surfaceTension if (sigma != sigmas_.end()) { tSurfaceTension.ref() += - dimensionedScalar("sigma", dimSigma_, sigma()) + dimensionedScalar(dimSigma_, sigma()) *fvc::interpolate(K(phase1, phase2))* ( fvc::interpolate(phase2)*fvc::snGrad(phase1) @@ -842,7 +827,7 @@ Foam::multiphaseSystem::nearInterface() const mesh_ ), mesh_, - dimensionedScalar("nearInterface", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -899,7 +884,7 @@ void Foam::multiphaseSystem::solve() mesh_ ), mesh_, - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), 0) ) ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C index a5793f3995..64ebd765e9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C @@ -110,7 +110,7 @@ Foam::phaseModel::phaseModel mesh ), mesh, - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), 0) ) { const word phiName = IOobject::groupName("phi", name_); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H index 38805b1104..e9dd2aa0ed 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H @@ -55,7 +55,7 @@ IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0) + dimensionedScalar(dimArea*dimVelocity, 0) ); volScalarField rho("rho", fluid.rho()); @@ -176,7 +176,7 @@ mesh ), mesh, - dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0) + dimensionedScalar(dimensionSet(-1, 3, 1, 0, 0), 0) ); phasei = 0; @@ -237,7 +237,7 @@ surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf); phasei = 0; - phi = dimensionedScalar("phi", phi.dimensions(), 0); + phi = dimensionedScalar(phi.dimensions(), 0); forAllIter(PtrDictionary, fluid.phases(), iter) { phaseModel& phase = iter(); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 2f0f58857a..04e70005c8 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -92,7 +92,7 @@ Foam::multiphaseMixture::multiphaseMixture IOobject::NO_WRITE ), mesh_, - dimensionedScalar("rhoPhi", dimMass/dimTime, 0) + dimensionedScalar(dimMass/dimTime, 0) ), alphas_ @@ -106,7 +106,7 @@ Foam::multiphaseMixture::multiphaseMixture IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("alphas", dimless, 0) + dimensionedScalar(dimless, 0) ), nu_ @@ -263,12 +263,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const mesh_ ), mesh_, - dimensionedScalar - ( - "surfaceTensionForce", - dimensionSet(1, -2, -2, 0, 0), - 0.0 - ) + dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), 0) ) ); @@ -296,7 +291,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const << exit(FatalError); } - stf += dimensionedScalar("sigma", dimSigma_, sigma()) + stf += dimensionedScalar(dimSigma_, sigma()) *fvc::interpolate(K(alpha1, alpha2))* ( fvc::interpolate(alpha2)*fvc::snGrad(alpha1) @@ -332,7 +327,7 @@ void Foam::multiphaseMixture::solve() mesh_ ), mesh_, - dimensionedScalar("0", rhoPhi_.dimensions(), 0) + dimensionedScalar(rhoPhi_.dimensions(), 0) ); dimensionedScalar totalDeltaT = runTime.deltaT(); @@ -544,7 +539,7 @@ Foam::multiphaseMixture::nearInterface() const mesh_ ), mesh_, - dimensionedScalar("nearInterface", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -631,7 +626,7 @@ void Foam::multiphaseMixture::solveAlphas MULES::limitSum(alphaPhiCorrs); - rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0); + rhoPhi_ = dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), 0); volScalarField sumAlpha ( @@ -642,7 +637,7 @@ void Foam::multiphaseMixture::solveAlphas mesh_ ), mesh_, - dimensionedScalar("sumAlpha", dimless, 0) + dimensionedScalar(dimless, 0) ); phasei = 0; diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 0aacb80c73..c1aa5d87ac 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("rAUf", dimTime, 1.0) + dimensionedScalar(dimTime, 1.0) ); if (correctPhi) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C index 9bc09cd9ea..75b261901e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C @@ -45,7 +45,7 @@ Foam::interfaceCompositionModels::Henry::Henry pair.phase1().mesh() ), pair.phase1().mesh(), - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ) { if (k_.size() != this->speciesNames_.size()) @@ -127,7 +127,7 @@ Foam::interfaceCompositionModels::Henry::YfPrime this->pair_.phase1().mesh() ), this->pair_.phase1().mesh(), - dimensionedScalar("zero", dimless/dimTemperature, 0) + dimensionedScalar(dimless/dimTemperature, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C index 5da022b542..bd23e1d6d1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C @@ -149,7 +149,7 @@ Foam::InterfaceCompositionModel::D p.mesh() ), p.mesh(), - dimensionedScalar("zero", dimArea/dimTime, 0) + dimensionedScalar(dimArea/dimTime, 0) ) ); @@ -203,7 +203,7 @@ Foam::InterfaceCompositionModel::L p.mesh() ), p.mesh(), - dimensionedScalar("zero", dimEnergy/dimMass, 0) + dimensionedScalar(dimEnergy/dimMass, 0) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C index 1a05155256..75c1aee347 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C @@ -45,7 +45,7 @@ NonRandomTwoLiquid pair.phase1().mesh() ), pair.phase1().mesh(), - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ), gamma2_ ( @@ -56,7 +56,7 @@ NonRandomTwoLiquid pair.phase1().mesh() ), pair.phase1().mesh(), - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ), beta12_("", dimless/dimTemperature, 0), beta21_("", dimless/dimTemperature, 0) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C index 4d40e3307a..4b5f360e82 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C @@ -44,7 +44,7 @@ Foam::interfaceCompositionModels::Raoult::Raoult pair.phase1().mesh() ), pair.phase1().mesh(), - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ), YNonVapourPrime_ ( @@ -55,7 +55,7 @@ Foam::interfaceCompositionModels::Raoult::Raoult pair.phase1().mesh() ), pair.phase1().mesh(), - dimensionedScalar("zero", dimless/dimTemperature, 0) + dimensionedScalar(dimless/dimTemperature, 0) ) { forAllConstIter(hashedWordList, this->speciesNames_, iter) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C index fe3274722f..fee2fcf5c1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C @@ -68,7 +68,7 @@ Foam::saturationModels::Antoine::pSat ) const { return - dimensionedScalar("one", dimPressure, 1) + dimensionedScalar(dimPressure, 1) *exp(A_ + B_/(C_ + T)); } @@ -100,7 +100,7 @@ Foam::saturationModels::Antoine::Tsat ) const { return - B_/(log(p*dimensionedScalar("one", dimless/dimPressure, 1)) - A_) + B_/(log(p*dimensionedScalar(dimless/dimPressure, 1)) - A_) - C_; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C index 257b524af3..030087a87d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C @@ -73,7 +73,7 @@ Foam::saturationModels::AntoineExtended::pSat ) const { return - dimensionedScalar("one", dimPressure/pow(dimTemperature, D_), 1) + dimensionedScalar(dimPressure/pow(dimTemperature, D_), 1) *exp(A_ + B_/(C_ + T) + E_*pow(T, F_)) *pow(T, D_); } @@ -98,7 +98,7 @@ Foam::saturationModels::AntoineExtended::lnPSat return A_ + B_/(C_ + T) - + D_*log(T*dimensionedScalar("one", dimless/dimTemperature, 1)) + + D_*log(T*dimensionedScalar(dimless/dimTemperature, 1)) + E_*pow(T, F_); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C index 7d23aa1f44..dcf42f4ab3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C @@ -113,7 +113,7 @@ Foam::saturationModels::constantSaturationConditions::pSatPrime false ), T.mesh(), - dimensionedScalar("zero", dimPressure/dimTemperature, 0) + dimensionedScalar(dimPressure/dimTemperature, 0) ) ); } @@ -139,7 +139,7 @@ Foam::saturationModels::constantSaturationConditions::lnPSat false ), T.mesh(), - dimensionedScalar("lnPSat", dimless, log(pSat_.value())) + dimensionedScalar(dimless, log(pSat_.value())) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C index 0858067534..4bed5f0263 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C @@ -114,7 +114,7 @@ Foam::saturationModels::function1::Tsat IOobject::NO_WRITE ), p.mesh(), - dimensionedScalar("zero", dimTemperature, 0) + dimensionedScalar(dimTemperature, 0) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C index dec92cf1c1..7f06b14d21 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C @@ -111,7 +111,7 @@ Foam::saturationModels::polynomial::Tsat IOobject::NO_WRITE ), p.mesh(), - dimensionedScalar("zero", dimTemperature, 0) + dimensionedScalar(dimTemperature, 0) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C index 41aa26bd35..dc122a0951 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -101,7 +101,7 @@ Foam::tmp Foam::dragModels::segregated::K() const mesh ), mesh, - dimensionedScalar("L", dimLength, 0), + dimensionedScalar(dimLength, 0), zeroGradientFvPatchField::typeName ); L.primitiveFieldRef() = cbrt(mesh.V()); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C index 73eb6521e4..1de375b5c4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C @@ -77,7 +77,7 @@ Foam::tmp Foam::liftModels::noLift::Cl() const false ), mesh, - dimensionedScalar("Cl", dimless, 0) + dimensionedScalar(dimless, 0) ) ); } @@ -125,7 +125,7 @@ Foam::tmp Foam::liftModels::noLift::Ff() const false ), mesh, - dimensionedScalar("zero", dimF*dimArea, 0) + dimensionedScalar(dimF*dimArea, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C index 7b063200ea..a4087cb7b1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C @@ -75,7 +75,7 @@ Foam::tmp Foam::swarmCorrections::noSwarm::Cs() const mesh ), mesh, - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C index 02932893bb..327d74f7db 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C @@ -84,7 +84,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::D() const false ), mesh, - dimensionedScalar("zero", dimD, 0) + dimensionedScalar(dimD, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C index fb1d1ac746..d9db88a61d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C @@ -77,7 +77,7 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const mesh ), mesh, - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ) ); } @@ -86,7 +86,7 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const Foam::tmp Foam::virtualMassModels::noVirtualMass::K() const { - return Cvm()*dimensionedScalar("zero", dimDensity, 0); + return Cvm()*dimensionedScalar(dimDensity, 0); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C index e78eb7a2b7..a7776e18f9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C @@ -76,7 +76,7 @@ Foam::tmp Foam::wallLubricationModels::Antal::Fi() const ( max ( - dimensionedScalar("zero", dimless/dimLength, 0), + dimensionedScalar(dimless/dimLength, 0), Cw1_/pair_.dispersed().d() + Cw2_/yWall() ) *pair_.continuous().rho() diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C index aa7436f8d2..faa3df629f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C @@ -86,7 +86,7 @@ Foam::tmp Foam::wallLubricationModels::Frank::Fi() const ) *max ( - dimensionedScalar("zero", dimless/dimLength, 0), + dimensionedScalar(dimless/dimLength, 0), (1 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1)) ) *pair_.continuous().rho() diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C index 9c02c9f385..2b5791b24c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C @@ -215,7 +215,7 @@ InterfaceCompositionPhaseChangePhaseSystem this->mesh() ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); @@ -231,7 +231,7 @@ InterfaceCompositionPhaseChangePhaseSystem this->mesh() ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); } @@ -431,7 +431,7 @@ correctInterfaceThermo() this->mesh() ), this->mesh(), - dimensionedScalar("zero", dimEnergy/dimVolume/dimTime, 0) + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); volScalarField mDotLPrime ( @@ -442,7 +442,7 @@ correctInterfaceThermo() this->mesh() ), this->mesh(), - dimensionedScalar("zero", mDotL.dimensions()/dimTemperature, 0) + dimensionedScalar(mDotL.dimensions()/dimTemperature, 0) ); // Add latent heats from forward and backward models diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C index a254a85f95..c26ae71711 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C @@ -74,7 +74,7 @@ Foam::MomentumTransferPhaseSystem::Kd false ), this->mesh_, - dimensionedScalar("zero", dragModel::dimK, 0) + dimensionedScalar(dragModel::dimK, 0) ) ); } @@ -108,7 +108,7 @@ Foam::MomentumTransferPhaseSystem::Kdf false ), this->mesh_, - dimensionedScalar("zero", dragModel::dimK, 0) + dimensionedScalar(dragModel::dimK, 0) ) ); } @@ -142,7 +142,7 @@ Foam::MomentumTransferPhaseSystem::Vm false ), this->mesh_, - dimensionedScalar("zero", virtualMassModel::dimK, 0) + dimensionedScalar(virtualMassModel::dimK, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C index 10ba09b6c3..724565c327 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C @@ -210,7 +210,7 @@ void Foam::PhaseTransferPhaseSystem::correct() ) { *rDmdt_[phaseTransferModelIter.key()] = - dimensionedScalar("zero", dimDensity/dimTime, 0); + dimensionedScalar(dimDensity/dimTime, 0); } forAllConstIter diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C index 4b7351db8f..d1a273097d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C @@ -119,7 +119,7 @@ PopulationBalancePhaseSystem IOobject::AUTO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C index dfe68b34cb..77609e543c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C @@ -113,7 +113,7 @@ ThermalPhaseChangePhaseSystem IOobject::AUTO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); @@ -132,7 +132,7 @@ ThermalPhaseChangePhaseSystem IOobject::AUTO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); @@ -151,7 +151,7 @@ ThermalPhaseChangePhaseSystem IOobject::AUTO_WRITE ), this->mesh(), - dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0) + dimensionedScalar(dimEnergy/dimTime/dimVolume, 0) ) ); } @@ -415,7 +415,7 @@ Foam::ThermalPhaseChangePhaseSystem::correctInterfaceThermo() } else { - iDmdtNew == dimensionedScalar("0", iDmdt.dimensions(), 0); + iDmdtNew == dimensionedScalar(iDmdt.dimensions(), 0); } volScalarField H1(heatTransferModelIter().first()->K()); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C index 1b47f13d43..1ac8d13f00 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C @@ -179,7 +179,7 @@ heatTransfer() const /max ( Ks.first()() + Ks.second()(), - dimensionedScalar("small", heatTransferModel::dimK, small) + dimensionedScalar(heatTransferModel::dimK, small) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C index 30b5d7967a..56a5b5646b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C @@ -62,7 +62,7 @@ Foam::tmp Foam::diameterModels::velocityGroup::dsm() const phase_.mesh() ), phase_.mesh(), - dimensionedScalar("invDsm", inv(dimLength), Zero) + dimensionedScalar(inv(dimLength), Zero) ) ); @@ -93,7 +93,7 @@ Foam::diameterModels::velocityGroup::fSum() const phase_.mesh() ), phase_.mesh(), - dimensionedScalar("sumSizeGroups", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -213,7 +213,7 @@ Foam::diameterModels::velocityGroup::velocityGroup IOobject::AUTO_WRITE ), phase.mesh(), - dimensionedScalar("d", dimLength, Zero) + dimensionedScalar(dimLength, Zero) ), dmdt_ ( @@ -224,7 +224,7 @@ Foam::diameterModels::velocityGroup::velocityGroup phase.mesh() ), phase.mesh(), - dimensionedScalar("dmdt", dimDensity/dimTime, Zero) + dimensionedScalar(dimDensity/dimTime, Zero) ) { if diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C index ffd6286e79..834abdd32e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C @@ -78,7 +78,7 @@ Foam::InertPhaseModel::Qdot() const this->mesh() ), this->mesh(), - dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0) + dimensionedScalar(dimEnergy/dimTime/dimVolume, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 3ddd96dafa..55842e9b13 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -151,7 +151,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), 0) ), alphaRhoPhi_ ( @@ -162,7 +162,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), 0) ), DUDt_(nullptr), DUDtf_(nullptr), @@ -188,7 +188,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ), continuityErrorSources_ ( @@ -199,7 +199,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ), K_(nullptr) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C index f2d6ecb946..f28a3fcfd6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C @@ -105,7 +105,7 @@ void Foam::MultiComponentPhaseModel::correctThermo() this->fluid().mesh() ), this->fluid().mesh(), - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ); PtrList& Yi = YRef(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C index bdd02059f1..57b9c15fce 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C @@ -56,7 +56,7 @@ Foam::phaseModel::phaseModel IOobject::AUTO_WRITE ), fluid.mesh(), - dimensionedScalar("alpha", dimless, 0) + dimensionedScalar(dimless, 0) ), fluid_(fluid), diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C index 22dc70e439..d24425eeaa 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C @@ -153,7 +153,7 @@ Foam::phaseSystem::phaseSystem mesh ), mesh, - dimensionedScalar("dpdt", dimPressure/dimTime, 0) + dimensionedScalar(dimPressure/dimTime, 0) ), MRF_(mesh_) @@ -313,7 +313,7 @@ Foam::phaseSystem::E(const phasePairKey& key) const false ), this->mesh_, - dimensionedScalar("zero", dimless, 1) + dimensionedScalar(dimless, 1) ) ); } @@ -343,7 +343,7 @@ Foam::phaseSystem::sigma(const phasePairKey& key) const false ), this->mesh_, - dimensionedScalar("zero", surfaceTensionModel::dimSigma, 0) + dimensionedScalar(surfaceTensionModel::dimSigma, 0) ) ); } @@ -366,7 +366,7 @@ Foam::tmp Foam::phaseSystem::dmdt this->mesh_ ), this->mesh_, - dimensionedScalar("zero", dimDensity/dimTime, 0) + dimensionedScalar(dimDensity/dimTime, 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C index 3b531e3f9d..b42def5536 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C @@ -60,7 +60,7 @@ Foam::diameterModels::driftModels::constantDrift::constantDrift popBal.mesh() ), popBal.mesh(), - dimensionedScalar("Sui", inv(dimVolume), Zero) + dimensionedScalar(inv(dimVolume), Zero) ) {} diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C index d042cf403e..05331062b3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C @@ -62,7 +62,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange popBal.mesh() ), popBal.mesh(), - dimensionedScalar("Sui", dimDensity/dimTime, Zero) + dimensionedScalar(dimDensity/dimTime, Zero) ), N_ ( @@ -73,7 +73,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange popBal.mesh() ), popBal.mesh(), - dimensionedScalar("Sui", inv(dimVolume), Zero) + dimensionedScalar(inv(dimVolume), Zero) ) {} diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index 9a333508fd..ae25f2af5b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -152,7 +152,7 @@ Foam::diameterModels::populationBalanceModel::add(sizeGroup& group) mesh_ ), mesh_, - dimensionedScalar("Su", inv(dimTime), 0) + dimensionedScalar(inv(dimTime), 0) ) ); @@ -167,7 +167,7 @@ Foam::diameterModels::populationBalanceModel::add(sizeGroup& group) mesh_ ), mesh_, - dimensionedScalar("SuSp", inv(dimTime), 0) + dimensionedScalar(inv(dimTime), 0) ) ); } @@ -812,7 +812,7 @@ Foam::diameterModels::populationBalanceModel::calcDsm() mesh_ ), mesh_, - dimensionedScalar("invDsm", inv(dimLength), Zero) + dimensionedScalar(inv(dimLength), Zero) ) ); @@ -900,7 +900,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("Sui", inv(dimTime), Zero) + dimensionedScalar(inv(dimTime), Zero) ), coalescence_ ( @@ -968,7 +968,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("coalescenceRate", dimVolume/dimTime, Zero) + dimensionedScalar(dimVolume/dimTime, Zero) ) ); } @@ -986,7 +986,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("breakupRate", inv(dimTime), Zero) + dimensionedScalar(inv(dimTime), Zero) ) ); } @@ -1027,7 +1027,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("driftRate", dimVolume/dimTime, Zero) + dimensionedScalar(dimVolume/dimTime, Zero) ) ); @@ -1042,7 +1042,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("r", dimless, Zero) + dimensionedScalar(dimless, Zero) ) ); @@ -1057,7 +1057,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel mesh_ ), mesh_, - dimensionedScalar("r", dimless, Zero) + dimensionedScalar(dimless, Zero) ) ); } @@ -1100,7 +1100,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("alpha", dimless, Zero) + dimensionedScalar(dimless, Zero) ) ); @@ -1117,7 +1117,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel IOobject::AUTO_WRITE ), mesh_, - dimensionedScalar("d", dimLength, Zero) + dimensionedScalar(dimLength, Zero) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index a1c0b1bf06..71544b41bb 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -85,7 +85,7 @@ void Foam::multiphaseSystem::solveAlphas() mesh_ ), mesh_, - dimensionedScalar("alphaVoid", dimless, 1) + dimensionedScalar(dimless, 1) ); forAll(stationaryPhases(), stationaryPhasei) { @@ -221,7 +221,7 @@ void Foam::multiphaseSystem::solveAlphas() mesh_ ), mesh_, - dimensionedScalar("Sp", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ); volScalarField::Internal Su @@ -314,7 +314,7 @@ void Foam::multiphaseSystem::solveAlphas() mesh_ ), mesh_, - dimensionedScalar("sumAlphaMoving", dimless, 0) + dimensionedScalar(dimless, 0) ); forAll(movingPhases(), movingPhasei) { @@ -519,7 +519,7 @@ Foam::multiphaseSystem::multiphaseSystem IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("alphas", dimless, 0) + dimensionedScalar(dimless, 0) ), cAlphas_(lookup("interfaceCompression")), @@ -562,12 +562,7 @@ Foam::tmp Foam::multiphaseSystem::surfaceTension mesh_ ), mesh_, - dimensionedScalar - ( - "surfaceTension", - dimensionSet(1, -2, -2, 0, 0), - 0 - ) + dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), 0) ) ); @@ -611,7 +606,7 @@ Foam::multiphaseSystem::nearInterface() const mesh_ ), mesh_, - dimensionedScalar("nearInterface", dimless, 0) + dimensionedScalar(dimless, 0) ) ); @@ -673,7 +668,7 @@ void Foam::multiphaseSystem::solve() mesh_ ), mesh_, - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), 0) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H index d5b0f4d520..f50de4b7b9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H @@ -180,7 +180,7 @@ while (pimple.correct()) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0) + dimensionedScalar(dimArea*dimVelocity, 0) ); forAll(phases, phasei) @@ -214,7 +214,7 @@ while (pimple.correct()) mesh ), mesh, - dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0) + dimensionedScalar(dimensionSet(-1, 3, 1, 0, 0), 0) ); forAll(phases, phasei) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H index bc6f4f35cd..c2c663c680 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H @@ -165,7 +165,7 @@ while (pimple.correct()) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0) + dimensionedScalar(dimArea*dimVelocity, 0) ); forAll(phases, phasei) @@ -199,7 +199,7 @@ while (pimple.correct()) mesh ), mesh, - dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0) + dimensionedScalar(dimensionSet(-1, 3, 1, 0, 0), 0) ); forAll(phases, phasei) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H index 8de77ec75b..d9026ae047 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H @@ -28,7 +28,7 @@ // Set the reciprocal time-step from the local Courant number rDeltaT.ref() = max ( - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + 1/dimensionedScalar(dimTime, maxDeltaT), fvc::surfaceSum(maxPhi)()() /((2*maxCo)*mesh.V()) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H index 5a4c77eacf..64c9f7354e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H @@ -15,7 +15,7 @@ if (LTS && faceMomentum) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("one", dimless/dimTime, 1) + dimensionedScalar(dimless/dimTime, 1) ) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H index 691114e520..437d50fad4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H @@ -21,7 +21,7 @@ // Set the reciprocal time-step from the local Courant number rDeltaT.ref() = max ( - 1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT), + 1/dimensionedScalar(dimTime, maxDeltaT), fvc::surfaceSum(max(mag(phi1), mag(phi2)))()() /((2*maxCo)*mesh.V()) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index 9f123735fd..0f1faa29a5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -124,7 +124,7 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu const volSymmTensorField& D ) const { - return dimensionedScalar("0.5", dimTime, 0.5)*pf*sin(phi_); + return dimensionedScalar(dimTime, 0.5)*pf*sin(phi_); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C index 159bc5b9c4..44485dad76 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C @@ -141,7 +141,7 @@ JohnsonJacksonSchaeffer::nu false ), phase.mesh(), - dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 7cbf71fbe9..e18b6e3c03 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -82,7 +82,7 @@ frictionalPressure const volScalarField& alpha = phase; return - dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) + dimensionedScalar(dimensionSet(1, -1, -2, 0, 0), 1e24) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0); } @@ -99,7 +99,7 @@ frictionalPressurePrime const volScalarField& alpha = phase; return - dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) + dimensionedScalar(dimensionSet(1, -1, -2, 0, 0), 1e25) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0); } @@ -130,7 +130,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu false ), phase.mesh(), - dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index afd6fd8d36..d7f23a9862 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -142,7 +142,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ), gs0_ @@ -156,7 +156,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 0, 0, 0, 0), 0) ), kappa_ @@ -170,7 +170,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), 0) ), nuFric_ @@ -184,7 +184,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::AUTO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) { if (type == typeName) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 62d040b173..65b961d9a1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -67,7 +67,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel coeffDict_.lookup("g0") ) { - nut_ == dimensionedScalar("zero", nut_.dimensions(), 0); + nut_ == dimensionedScalar(nut_.dimensions(), 0); if (type == typeName) { diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C index 3ceaceaaa1..b97e542e65 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C @@ -59,7 +59,7 @@ Foam::diameterModels::IATEsources::dummy::R iate_.phase().mesh() ), iate_.phase().mesh(), - dimensionedScalar("R", kappai.dimensions()/dimTime, 0) + dimensionedScalar(kappai.dimensions()/dimTime, 0) ); return fvm::Su(R, kappai); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C index ef2b99442a..2e10aef5e2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C @@ -76,7 +76,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R iate_.phase().mesh() ), iate_.phase().mesh(), - dimensionedScalar("R", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ); const scalar Crc = Crc_.value(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C index 9d7be595f8..dc36a98ebf 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C @@ -75,7 +75,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R iate_.phase().mesh() ), iate_.phase().mesh(), - dimensionedScalar("R", kappai.dimensions()/dimTime, 0) + dimensionedScalar(kappai.dimensions()/dimTime, 0) ); const scalar Cti = Cti_.value(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C index 606a02af50..31e8dfbe75 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C @@ -74,7 +74,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R phase().mesh() ), phase().mesh(), - dimensionedScalar("R", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ); volScalarField::Internal Rdk @@ -86,7 +86,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R phase().mesh() ), phase().mesh(), - dimensionedScalar("Rdk", kappai.dimensions()/dimTime, 0) + dimensionedScalar(kappai.dimensions()/dimTime, 0) ); const phaseCompressibleTurbulenceModel& turbulence = diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index f4786272e3..0cfcea84b8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -197,7 +197,7 @@ void Foam::twoPhaseSystem::solve() mesh_ ), mesh_, - dimensionedScalar("Sp", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ); volScalarField::Internal Su diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H index 81c65c1caf..0756936b76 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H @@ -12,7 +12,7 @@ if (nAlphaSubCycles > 1) mesh ), mesh, - dimensionedScalar("0", rhoPhi.dimensions(), 0) + dimensionedScalar(rhoPhi.dimensions(), 0) ); for diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index 011b18b1a0..aebb443897 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H @@ -73,7 +73,7 @@ volScalarField dpdt mesh ), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + dimensionedScalar(p.dimensions()/dimTime, 0) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C index 35dd08397f..d4996cbbc7 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -101,7 +101,7 @@ Foam::tmp Foam::dragModels::segregated::K() const mesh ), mesh, - dimensionedScalar("L", dimLength, 0), + dimensionedScalar(dimLength, 0), zeroGradientFvPatchField::typeName ); L.primitiveFieldRef() = cbrt(mesh.V()); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C index 73eb6521e4..1de375b5c4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C @@ -77,7 +77,7 @@ Foam::tmp Foam::liftModels::noLift::Cl() const false ), mesh, - dimensionedScalar("Cl", dimless, 0) + dimensionedScalar(dimless, 0) ) ); } @@ -125,7 +125,7 @@ Foam::tmp Foam::liftModels::noLift::Ff() const false ), mesh, - dimensionedScalar("zero", dimF*dimArea, 0) + dimensionedScalar(dimF*dimArea, 0) ) ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C index 7b063200ea..a4087cb7b1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C @@ -75,7 +75,7 @@ Foam::tmp Foam::swarmCorrections::noSwarm::Cs() const mesh ), mesh, - dimensionedScalar("one", dimless, 1) + dimensionedScalar(dimless, 1) ) ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C index 02932893bb..327d74f7db 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C @@ -84,7 +84,7 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::D() const false ), mesh, - dimensionedScalar("zero", dimD, 0) + dimensionedScalar(dimD, 0) ) ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C index fb1d1ac746..d9db88a61d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C @@ -77,7 +77,7 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const mesh ), mesh, - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ) ); } @@ -86,7 +86,7 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const Foam::tmp Foam::virtualMassModels::noVirtualMass::K() const { - return Cvm()*dimensionedScalar("zero", dimDensity, 0); + return Cvm()*dimensionedScalar(dimDensity, 0); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C index 7ab5df1c11..600cb8c12a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C @@ -75,7 +75,7 @@ Foam::tmp Foam::wallLubricationModels::Antal::Fi() const return max ( - dimensionedScalar("zero", dimless/dimLength, 0), + dimensionedScalar(dimless/dimLength, 0), Cw1_/pair_.dispersed().d() + Cw2_/yWall() ) *pair_.continuous().rho() diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C index 73bf0f7980..7c983e3886 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C @@ -85,7 +85,7 @@ Foam::tmp Foam::wallLubricationModels::Frank::Fi() const ) *max ( - dimensionedScalar("zero", dimless/dimLength, 0), + dimensionedScalar(dimless/dimLength, 0), (1.0 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1.0)) ) *pair_.continuous().rho() diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index 765babc90f..305bc1a01f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -124,7 +124,7 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu const volSymmTensorField& D ) const { - return dimensionedScalar("0.5", dimTime, 0.5)*pf*sin(phi_); + return dimensionedScalar(dimTime, 0.5)*pf*sin(phi_); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C index 266683b615..c9aa03cd78 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C @@ -141,7 +141,7 @@ JohnsonJacksonSchaeffer::nu false ), phase.mesh(), - dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 7cbf71fbe9..e18b6e3c03 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -82,7 +82,7 @@ frictionalPressure const volScalarField& alpha = phase; return - dimensionedScalar("1e24", dimensionSet(1, -1, -2, 0, 0), 1e24) + dimensionedScalar(dimensionSet(1, -1, -2, 0, 0), 1e24) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 10.0); } @@ -99,7 +99,7 @@ frictionalPressurePrime const volScalarField& alpha = phase; return - dimensionedScalar("1e25", dimensionSet(1, -1, -2, 0, 0), 1e25) + dimensionedScalar(dimensionSet(1, -1, -2, 0, 0), 1e25) *pow(Foam::max(alpha - alphaMinFriction, scalar(0)), 9.0); } @@ -130,7 +130,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu false ), phase.mesh(), - dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 16c4a7c270..17017d03bf 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -142,7 +142,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ), gs0_ @@ -156,7 +156,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 0, 0, 0, 0), 0) ), kappa_ @@ -170,7 +170,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::NO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), 0) ), nuFric_ @@ -184,7 +184,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel IOobject::AUTO_WRITE ), U.mesh(), - dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), 0) ) { if (type == typeName) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 601ce58093..192aa8a633 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -70,7 +70,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel coeffDict_.lookup("g0") ) { - nut_ == dimensionedScalar("zero", nut_.dimensions(), 0); + nut_ == dimensionedScalar(nut_.dimensions(), 0); if (type == typeName) { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index 68ad7c14f7..40d3d0570e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -151,7 +151,7 @@ Foam::BlendedInterfacialModel::K() const false ), pair_.phase1().mesh(), - dimensionedScalar("zero", modelType::dimK, 0) + dimensionedScalar(modelType::dimK, 0) ) ); @@ -219,7 +219,7 @@ Foam::BlendedInterfacialModel::Kf() const false ), pair_.phase1().mesh(), - dimensionedScalar("zero", modelType::dimK, 0) + dimensionedScalar(modelType::dimK, 0) ) ); @@ -350,7 +350,7 @@ Foam::BlendedInterfacialModel::Ff() const false ), pair_.phase1().mesh(), - dimensionedScalar("zero", modelType::dimF*dimArea, 0) + dimensionedScalar(modelType::dimF*dimArea, 0) ) ); @@ -412,7 +412,7 @@ Foam::BlendedInterfacialModel::D() const false ), pair_.phase1().mesh(), - dimensionedScalar("zero", modelType::dimD, 0) + dimensionedScalar(modelType::dimD, 0) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C index 1f686023cc..fa69f8cd0f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C @@ -86,7 +86,6 @@ Foam::tmp Foam::blendingMethods::noBlending::f1 mesh, dimensionedScalar ( - "f", dimless, phase2.name() != continuousPhase_ ) @@ -117,7 +116,6 @@ Foam::tmp Foam::blendingMethods::noBlending::f2 mesh, dimensionedScalar ( - "f", dimless, phase1.name() == continuousPhase_ ) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C index 121e599014..caf5a7ed5b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C @@ -57,7 +57,7 @@ Foam::diameterModels::IATEsources::dummy::R() const iate_.phase().mesh() ), iate_.phase().U().mesh(), - dimensionedScalar("R", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ) ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C index f0c2ff94b0..7daa3a7680 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C @@ -73,7 +73,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R() const iate_.phase().mesh() ), iate_.phase().U().mesh(), - dimensionedScalar("R", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C index 59c114715f..039640f180 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C @@ -72,7 +72,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R() const iate_.phase().mesh() ), iate_.phase().U().mesh(), - dimensionedScalar("R", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C index bbf2e8bcc9..9e712a73f6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C @@ -58,7 +58,7 @@ Foam::phaseModel::phaseModel IOobject::AUTO_WRITE ), fluid.mesh(), - dimensionedScalar("alpha", dimless, 0) + dimensionedScalar(dimless, 0) ), fluid_(fluid), name_(phaseName), @@ -95,7 +95,7 @@ Foam::phaseModel::phaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), 0) ), alphaRhoPhi_ ( @@ -106,7 +106,7 @@ Foam::phaseModel::phaseModel fluid.mesh() ), fluid.mesh(), - dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0) + dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), 0) ) { thermo_->validate("phaseModel " + name_, "h", "e"); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index a613ce5752..9d711083ab 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -107,7 +107,7 @@ Foam::twoPhaseSystem::twoPhaseSystem IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("dgdt", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ) { phase2_.volScalarField::operator=(scalar(1) - phase1_); @@ -400,7 +400,7 @@ void Foam::twoPhaseSystem::solve() mesh_ ), mesh_, - dimensionedScalar("Sp", dgdt_.dimensions(), 0) + dimensionedScalar(dgdt_.dimensions(), 0) ); volScalarField::Internal Su diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H index a912d80e07..961e771912 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H @@ -38,7 +38,6 @@ mesh, dimensionedScalar ( - "rho", dimMass/dimVolume, rhoValue ) @@ -93,7 +92,6 @@ mesh, dimensionedScalar ( - "Erho", dimMass/dimLength/sqr(dimTime), rhoEValue ) @@ -147,7 +145,6 @@ mesh, dimensionedScalar ( - "nu", dimless, nuValue ) diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H index f329e99333..4a0931b385 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H @@ -25,7 +25,7 @@ volScalarField threeKalpha IOobject::NO_WRITE ), mesh, - dimensionedScalar("0", dimensionSet(0, 2, -2 , -1, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -2 , -1, 0), 0) ); @@ -40,7 +40,7 @@ volScalarField DT IOobject::NO_WRITE ), mesh, - dimensionedScalar("0", dimensionSet(0, 2, -1 , 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -1 , 0, 0), 0) ); @@ -72,7 +72,6 @@ if (thermalStress) mesh, dimensionedScalar ( - "C", dimensionSet(0, 2, -2 , -1, 0), CValue ) @@ -127,7 +126,6 @@ if (thermalStress) mesh, dimensionedScalar ( - "rhoK", dimensionSet(1, 1, -3 , -1, 0), rhoKValue ) @@ -183,7 +181,6 @@ if (thermalStress) mesh, dimensionedScalar ( - "alpha", inv(dimTemperature), alphaValue ) diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C index 13e41a72ab..c335e1129b 100644 --- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C +++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("aggomeration", dimless, 0) + dimensionedScalar(dimless, 0) ); scalarField& fld = scalarAgglomeration.primitiveFieldRef(); forAll(fld, celli) @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("aggomeration", dimless, 0) + dimensionedScalar(dimless, 0) ); scalarField& fld = scalarAgglomeration.primitiveFieldRef(); forAll(fld, celli) diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C index 66797ccbe7..d6fbd6fae7 100644 --- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C +++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("patchDist", dimLength, 0) + dimensionedScalar(dimLength, 0) ); scalarField pf(vsf.boundaryField()[patch.index()].size()); forAll(pf, facei) @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("otherPatchDist", dimLength, 0) + dimensionedScalar(dimLength, 0) ); vsf.boundaryFieldRef()[patch.index()] = pwd; diff --git a/applications/test/PointEdgeWave/Test-PointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C index f5ad9cc898..8eb18a1f57 100644 --- a/applications/test/PointEdgeWave/Test-PointEdgeWave.C +++ b/applications/test/PointEdgeWave/Test-PointEdgeWave.C @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), pointMesh::New(mesh), - dimensionedScalar("wallDist", dimLength, 0) + dimensionedScalar(dimLength, 0) ); forAll(allPointInfo, pointi) diff --git a/applications/test/fieldDependency/Test-fieldDependency.C b/applications/test/fieldDependency/Test-fieldDependency.C index f98a7481c1..55f564777f 100644 --- a/applications/test/fieldDependency/Test-fieldDependency.C +++ b/applications/test/fieldDependency/Test-fieldDependency.C @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ); Info<< "Creating field p\n" << endl; @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ); diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 7b92467777..91e78c81bc 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), zeroGradientFvPatchScalarField::typeName ); Info<< "Writing one field " @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), calculatedFvsPatchScalarField::typeName ); Info<< "Writing surface one field " diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 26271042c5..bdfd48d4d0 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), zeroGradientFvPatchScalarField::typeName ); Info<< "Writing one field " @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), calculatedFvsPatchScalarField::typeName ); Info<< "Writing surface one field " @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), pointMesh::New(mesh), - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), calculatedPointPatchScalarField::typeName ); pointX.primitiveFieldRef() = mesh.points().component(0); diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C index eb228ac394..6e6980481e 100644 --- a/applications/test/volField/Test-volField.C +++ b/applications/test/volField/Test-volField.C @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) + fvm::div(phi, st) - fvm::laplacian ( - dimensionedScalar("D", sqr(dimLength)/dimTime, 1), + dimensionedScalar(sqr(dimLength)/dimTime, 1), st ) == diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index c3a6f7438c..4667f1930a 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -279,7 +279,7 @@ int main(int argc, char *argv[]) IOobject::NO_WRITE ), fMesh, - dimensionedScalar("zero", dimless/dimTime, 0) + dimensionedScalar(dimless/dimTime, 0) ); // Set cell values diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C index e16d5a2c73..59b431d484 100644 --- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C @@ -1119,7 +1119,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("cellId", dimless, 0) + dimensionedScalar(dimless, 0) ); forAll(foamCellMap, celli) @@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("cellType", dimless, 0) + dimensionedScalar(dimless, 0) ); forAll(foamCellType, celli) diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index 1b0a5a7063..b04b2bf33c 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -140,7 +140,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement() IOobject::NO_WRITE ), mesh_, - dimensionedScalar("one", dimless, 1.0), + dimensionedScalar(dimless, 1.0), zeroGradientFvPatchScalarField::typeName ); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C index 1fdb2698ec..ad7ad0a337 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C @@ -1121,7 +1121,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("cellSize", dimLength, 0), + dimensionedScalar(dimLength, 0), zeroGradientFvPatchScalarField::typeName ); @@ -1147,7 +1147,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // IOobject::AUTO_WRITE // ), // mesh, - // dimensionedScalar("cellVolume", dimLength, 0), + // dimensionedScalar(dimLength, 0), // zeroGradientFvPatchScalarField::typeName // ); @@ -1166,7 +1166,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // IOobject::AUTO_WRITE // ), // mesh, - // dimensionedScalar("cellVolume", dimVolume, 0), + // dimensionedScalar(dimVolume, 0), // zeroGradientFvPatchScalarField::typeName // ); @@ -1185,7 +1185,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // IOobject::AUTO_WRITE // ), // mesh, - // dimensionedScalar("cellSize", dimLength, 0), + // dimensionedScalar(dimLength, 0), // zeroGradientFvPatchScalarField::typeName // ); @@ -1231,7 +1231,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // IOobject::AUTO_WRITE // ), // ptMesh, - // dimensionedScalar("ptTargetCellSize", dimLength, 0), + // dimensionedScalar(dimLength, 0), // pointPatchVectorField::calculatedType() // ); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C index 96dff5a02d..83aeddd4e7 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C @@ -77,7 +77,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh) IOobject::NO_WRITE ), bMesh, - dimensionedScalar("weight", dimless, 1e-2), + dimensionedScalar(dimless, 1e-2), zeroGradientFvPatchScalarField::typeName ); diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index f4ec7e269d..cea5a848c7 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -616,7 +616,7 @@ int main(int argc, char *argv[]) false ), mesh, - dimensionedScalar("zero", dimLength, 0) + dimensionedScalar(dimLength, 0) ); const searchableSurfaces& geometry = geometryToConformTo.geometry(); @@ -679,7 +679,7 @@ int main(int argc, char *argv[]) false ), pointMesh::New(mesh), - dimensionedScalar("zero", dimLength, 0) + dimensionedScalar(dimLength, 0) ); { scalarField pointDistSqr(mesh.nPoints(), -sqr(great)); diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C index ee812ce093..a9e016e765 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C @@ -80,7 +80,7 @@ tmp createScalarField false ), mesh, - dimensionedScalar("zero", dimless, 0), + dimensionedScalar(dimless, 0), zeroGradientFvPatchScalarField::typeName ) ); diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index e8865274e1..0ee9b554a4 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -1428,7 +1428,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion) false ), mesh, - dimensionedScalar("zero", dimless, 0), + dimensionedScalar(dimless, 0), zeroGradientFvPatchScalarField::typeName ); forAll(cellRegion, celli) diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index b06b1e7f6b..b1f9858332 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C @@ -521,7 +521,7 @@ int main(int argc, char *argv[]) IOobject::AUTO_WRITE ), mesh, - dimensionedScalar("cellDist", dimless, 0) + dimensionedScalar(dimless, 0) ); forAll(procIds, celli) diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index 9276743e5d..8a202ec88c 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -427,7 +427,7 @@ void writeCellDistance IOobject::AUTO_WRITE ), masterMesh, - dimensionedScalar("cellDist", dimless, 0), + dimensionedScalar(dimless, 0), extrapolatedCalculatedFvPatchScalarField::typeName ); diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H index 0442279451..7158de8665 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H +++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H @@ -69,7 +69,7 @@ volScalarField mask IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimless, 0), + dimensionedScalar(dimless, 0), zeroGradientFvPatchScalarField::typeName ); diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C index 825a2add3e..d44d900b29 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C +++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) IOobject::NO_WRITE ), mesh, - dimensionedScalar("facesAgglomeration", dimless, 0) + dimensionedScalar(dimless, 0) ); volScalarField::Boundary& facesAgglomerationBf = diff --git a/applications/utilities/preProcessing/setWaves/setWaves.C b/applications/utilities/preProcessing/setWaves/setWaves.C index c542f84fe3..ba93193e6d 100644 --- a/applications/utilities/preProcessing/setWaves/setWaves.C +++ b/applications/utilities/preProcessing/setWaves/setWaves.C @@ -133,13 +133,13 @@ int main(int argc, char *argv[]) ( IOobject("h", runTime.timeName(), mesh), mesh, - dimensionedScalar("0", dimLength, 0) + dimensionedScalar(dimLength, 0) ); pointScalarField hp ( IOobject("hp", runTime.timeName(), mesh), pMesh, - dimensionedScalar("0", dimLength, 0) + dimensionedScalar(dimLength, 0) ); volVectorField uGas ( diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index 9e55f36d31..27de66c7be 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -828,7 +828,7 @@ int main(int argc, char *argv[]) IOobject::NO_WRITE ), mesh, - dimensionedScalar("viewFactorField", dimless, 0) + dimensionedScalar(dimless, 0) ); volScalarField::Boundary& viewFactorFieldBf = diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H index 4f07c9ef37..a884e0cb68 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.H +++ b/src/OpenFOAM/db/regIOobject/regIOobject.H @@ -67,7 +67,9 @@ class regIOobject : public IOobject { + protected: + //- Helper: check readOpt flags and read if necessary bool readHeaderOk ( diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H index c9d5e4ab9e..2f185ccb86 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H +++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H @@ -33,6 +33,7 @@ inline bool Foam::regIOobject::ownedByRegistry() const inline void Foam::regIOobject::store() { + checkIn(); ownedByRegistry_ = true; } @@ -47,6 +48,7 @@ inline Type& Foam::regIOobject::store(Type* tPtr) << abort(FatalError); } + tPtr->regIOobject::checkIn(); tPtr->regIOobject::ownedByRegistry_ = true; return *tPtr; @@ -65,6 +67,7 @@ inline Type& Foam::regIOobject::store(autoPtr& atPtr) << abort(FatalError); } + tPtr->regIOobject::checkIn(); tPtr->regIOobject::ownedByRegistry_ = true; return *tPtr; diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index c37d6a61bf..27aa9dacca 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -732,8 +732,8 @@ Foam::GeometricField::New IOobject ( name, - mesh.time().timeName(), - mesh, + mesh.thisDb().time().timeName(), + mesh.thisDb(), IOobject::NO_READ, IOobject::NO_WRITE, false @@ -763,8 +763,8 @@ Foam::GeometricField::New IOobject ( name, - mesh.time().timeName(), - mesh, + mesh.thisDb().time().timeName(), + mesh.thisDb(), IOobject::NO_READ, IOobject::NO_WRITE, false @@ -796,8 +796,8 @@ Foam::GeometricField::New IOobject ( name, - mesh.time().timeName(), - mesh, + mesh.thisDb().time().timeName(), + mesh.thisDb(), IOobject::NO_READ, IOobject::NO_WRITE, false @@ -1173,14 +1173,9 @@ Foam::GeometricField::T() const { tmp> result ( - new GeometricField + GeometricField::New ( - IOobject - ( - this->name() + ".T()", - this->instance(), - this->db() - ), + this->name() + ".T()", this->mesh(), this->dimensions() ) @@ -1210,14 +1205,9 @@ Foam::GeometricField::component { tmp> Component ( - new GeometricField + GeometricField::New ( - IOobject - ( - this->name() + ".component(" + Foam::name(d) + ')', - this->instance(), - this->db() - ), + this->name() + ".component(" + Foam::name(d) + ')', this->mesh(), this->dimensions() ) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C index f4d8857440..6b06d4be7d 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C @@ -101,16 +101,9 @@ pow tmp> tPow ( - new GeometricField + GeometricField::New ( - IOobject - ( - "pow(" + gf.name() + ',' + name(r) + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "pow(" + gf.name() + ',' + name(r) + ')', gf.mesh(), pow(gf.dimensions(), r) ) @@ -142,16 +135,9 @@ pow tmp> tPow ( - new GeometricField + GeometricField::New ( - IOobject - ( - "pow(" + gf.name() + ',' + name(r) + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "pow(" + gf.name() + ',' + name(r) + ')', gf.mesh(), pow(gf.dimensions(), r) ) @@ -193,16 +179,9 @@ sqr(const GeometricField& gf) tmp> tSqr ( - new GeometricField + GeometricField::New ( - IOobject - ( - "sqr(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "sqr(" + gf.name() + ')', gf.mesh(), sqr(gf.dimensions()) ) @@ -231,16 +210,9 @@ sqr(const tmp>& tgf) tmp> tSqr ( - new GeometricField + GeometricField::New ( - IOobject - ( - "sqr(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "sqr(" + gf.name() + ')', gf.mesh(), sqr(gf.dimensions()) ) @@ -273,16 +245,9 @@ tmp> magSqr { tmp> tMagSqr ( - new GeometricField + GeometricField::New ( - IOobject - ( - "magSqr(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "magSqr(" + gf.name() + ')', gf.mesh(), sqr(gf.dimensions()) ) @@ -303,16 +268,9 @@ tmp> magSqr tmp> tMagSqr ( - new GeometricField + GeometricField::New ( - IOobject - ( - "magSqr(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "magSqr(" + gf.name() + ')', gf.mesh(), sqr(gf.dimensions()) ) @@ -345,16 +303,9 @@ tmp> mag { tmp> tMag ( - new GeometricField + GeometricField::New ( - IOobject - ( - "mag(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "mag(" + gf.name() + ')', gf.mesh(), gf.dimensions() ) @@ -375,16 +326,9 @@ tmp> mag tmp> tMag ( - new GeometricField + GeometricField::New ( - IOobject - ( - "mag(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "mag(" + gf.name() + ')', gf.mesh(), gf.dimensions() ) @@ -431,16 +375,9 @@ cmptAv(const GeometricField& gf) tmp> CmptAv ( - new GeometricField + GeometricField::New ( - IOobject - ( - "cmptAv(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "cmptAv(" + gf.name() + ')', gf.mesh(), gf.dimensions() ) @@ -470,16 +407,9 @@ cmptAv(const tmp>& tgf) tmp> CmptAv ( - new GeometricField + GeometricField::New ( - IOobject - ( - "cmptAv(" + gf.name() + ')', - gf.instance(), - gf.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "cmptAv(" + gf.name() + ')', gf.mesh(), gf.dimensions() ) @@ -628,16 +558,9 @@ operator op \ typedef typename product::type productType; \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + gf1.name() + #op + gf2.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + gf1.name() + #op + gf2.name() + ')', \ gf1.mesh(), \ gf1.dimensions() op gf2.dimensions() \ ) \ @@ -772,16 +695,9 @@ operator op \ \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + gf1.name() + #op + dvs.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + gf1.name() + #op + dvs.name() + ')', \ gf1.mesh(), \ gf1.dimensions() op dvs.dimensions() \ ) \ @@ -884,16 +800,9 @@ operator op \ typedef typename product::type productType; \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + dvs.name() + #op + gf1.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + dvs.name() + #op + gf1.name() + ')', \ gf1.mesh(), \ dvs.dimensions() op gf1.dimensions() \ ) \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C index baa556735a..ce04bfbd9f 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C @@ -53,16 +53,9 @@ tmp> Func \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - #Func "(" + gf1.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + #Func "(" + gf1.name() + ')', \ gf1.mesh(), \ Dfunc(gf1.dimensions()) \ ) \ @@ -122,16 +115,9 @@ tmp> operator Op \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - #Op + gf1.name(), \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + #Op + gf1.name(), \ gf1.mesh(), \ Dfunc(gf1.dimensions()) \ ) \ @@ -203,16 +189,9 @@ tmp> Func \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - #Func "(" + gf1.name() + ',' + gf2.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + #Func "(" + gf1.name() + ',' + gf2.name() + ')', \ gf1.mesh(), \ Func(gf1.dimensions(), gf2.dimensions()) \ ) \ @@ -331,16 +310,9 @@ tmp> Func \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - #Func "(" + dt1.name() + ',' + gf2.name() + ')', \ - gf2.instance(), \ - gf2.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + #Func "(" + dt1.name() + ',' + gf2.name() + ')', \ gf2.mesh(), \ Func(dt1.dimensions(), gf2.dimensions()) \ ) \ @@ -422,16 +394,9 @@ tmp> Func \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - #Func "(" + gf1.name() + ',' + dt2.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + #Func "(" + gf1.name() + ',' + dt2.name() + ')', \ gf1.mesh(), \ Func(gf1.dimensions(), dt2.dimensions()) \ ) \ @@ -522,16 +487,9 @@ tmp> operator Op \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + gf1.name() + OpName + gf2.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + gf1.name() + OpName + gf2.name() + ')', \ gf1.mesh(), \ gf1.dimensions() Op gf2.dimensions() \ ) \ @@ -650,16 +608,9 @@ tmp> operator Op \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + dt1.name() + OpName + gf2.name() + ')', \ - gf2.instance(), \ - gf2.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + dt1.name() + OpName + gf2.name() + ')', \ gf2.mesh(), \ dt1.dimensions() Op gf2.dimensions() \ ) \ @@ -741,16 +692,9 @@ tmp> operator Op \ { \ tmp> tRes \ ( \ - new GeometricField \ + GeometricField::New \ ( \ - IOobject \ - ( \ - '(' + gf1.name() + OpName + dt2.name() + ')', \ - gf1.instance(), \ - gf1.db(), \ - IOobject::NO_READ, \ - IOobject::NO_WRITE \ - ), \ + '(' + gf1.name() + OpName + dt2.name() + ')', \ gf1.mesh(), \ gf1.dimensions() Op dt2.dimensions() \ ) \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H index 6276860089..8626ff26d2 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H @@ -97,14 +97,9 @@ tmp> New { tmp> rtgf ( - new GeometricField + GeometricField::New ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), + name, gf1.mesh(), dimensions ) @@ -140,19 +135,11 @@ public: { const GeometricField& gf1 = tgf1(); - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } }; @@ -181,19 +168,11 @@ public: } else { - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } } @@ -223,19 +202,11 @@ public: { const GeometricField& gf1 = tgf1(); - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } }; @@ -274,19 +245,11 @@ public: } else { - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } } @@ -323,19 +286,11 @@ public: } else { - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } } @@ -374,19 +329,11 @@ public: } else { - return tmp> + return GeometricField::New ( - new GeometricField - ( - IOobject - ( - name, - gf1.instance(), - gf1.db() - ), - gf1.mesh(), - dimensions - ) + name, + gf1.mesh(), + dimensions ); } } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C index 36f8a7cad7..f4ec6a9364 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C @@ -39,16 +39,9 @@ Foam::tmp Foam::uniformInterpolate // Interpolate tmp tfld ( - new GeoField + GeoField::New ( - IOobject - ( - "uniformInterpolate(" + field0.name() + ')', - field0.time().timeName(), - field0.db(), - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), + "uniformInterpolate(" + field0.name() + ')', weights[0]*(*fields[indices[0]]) ) ); @@ -91,7 +84,7 @@ Foam::tmp Foam::uniformInterpolate // Interpolate - tmp tfld(new GeoField(fieldIO, weights[0]*field0)); + tmp tfld(GeoField::New(fieldIO.name(), weights[0]*field0)); GeoField& fld = tfld.ref(); for (label i = 1; i < times.size(); ++i) diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C index 373188b04a..b0c315cd2b 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C +++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C @@ -146,7 +146,7 @@ buoyantKEpsilon::epsilonSource() const volScalarField u ( mag(this->U_ - gHat*v) - + dimensionedScalar("small", dimVelocity, small) + + dimensionedScalar(dimVelocity, small) ); return -fvm::SuSp(this->C1_*tanh(mag(v)/u)*Gcoef(), this->epsilon_); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C index f3f2914c6d..de96e9882e 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C @@ -57,7 +57,7 @@ tmp kkLOmega::fINT() const min ( kt_/(Cint_*(kl_ + kt_ + kMin_)), - dimensionedScalar("1.0", dimless, 1.0) + dimensionedScalar(dimless, 1.0) ) ); } @@ -193,7 +193,7 @@ tmp kkLOmega::phiNAT ReOmega - CnatCrit_ / ( - fNatCrit + dimensionedScalar("ROTvSmall", dimless, rootVSmall) + fNatCrit + dimensionedScalar(dimless, rootVSmall) ), scalar(0) ) @@ -615,7 +615,7 @@ void kkLOmega::correct() pow ( lambdaEff - /(lambdaT + dimensionedScalar("small", dimLength, rootVSmall)), + /(lambdaT + dimensionedScalar(dimLength, rootVSmall)), 2.0/3.0 ) ); diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index fa8fa028c2..c94cc2b8c8 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -45,7 +45,7 @@ kOmegaSST::kOmegaSST::F1 tmp CDkOmegaPlus = max ( CDkOmega, - dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10) + dimensionedScalar(dimless/sqr(dimTime), 1.0e-10) ); tmp arg1 = min diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C index 56396870ad..e9e43f476c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C @@ -60,7 +60,7 @@ void Foam::LESModels::vanDriestDelta::calcDelta() mesh ), mesh, - dimensionedScalar("ystar", dimLength, great) + dimensionedScalar(dimLength, great) ); const fvPatchList& patches = mesh.boundary(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C index e103824d7f..fc81f1e45c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C @@ -53,7 +53,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff) mesh ), mesh, - dimensionedScalar("zero", dimLength*dimLength, 0), + dimensionedScalar(dimLength*dimLength, 0), calculatedFvPatchScalarField::typeName ) { @@ -77,7 +77,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd) mesh ), mesh, - dimensionedScalar("zero", dimLength*dimLength, 0), + dimensionedScalar(dimLength*dimLength, 0), calculatedFvPatchScalarField::typeName ) { diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index 0b2f307783..2651f22402 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C @@ -49,7 +49,7 @@ tmp SpalartAllmarasDDES::rd max ( magGradU, - dimensionedScalar("small", magGradU.dimensions(), small) + dimensionedScalar(magGradU.dimensions(), small) ) *sqr(this->kappa_*this->y_) ), @@ -89,9 +89,9 @@ tmp SpalartAllmarasDDES::dTilda *max ( this->y_ - this->CDES_*this->delta(), - dimensionedScalar("zero", dimLength, 0) + dimensionedScalar(dimLength, 0) ), - dimensionedScalar("small", dimLength, small) + dimensionedScalar(dimLength, small) ); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C index 73d4a1dedb..cfd908d8bd 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C @@ -122,7 +122,7 @@ tmp SpalartAllmarasDES::r max ( Omega, - dimensionedScalar("small", Omega.dimensions(), small) + dimensionedScalar(Omega.dimensions(), small) ) *sqr(kappa_*dTilda) ), @@ -440,7 +440,7 @@ void SpalartAllmarasDES::correct() fvOptions.constrain(nuTildaEqn.ref()); solve(nuTildaEqn); fvOptions.correct(nuTilda_); - bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0)); + bound(nuTilda_, dimensionedScalar(nuTilda_.dimensions(), 0)); nuTilda_.correctBoundaryConditions(); correctNut(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 1474178952..2999273a70 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -79,7 +79,7 @@ tmp SpalartAllmarasIDDES::rd max ( magGradU, - dimensionedScalar("small", magGradU.dimensions(), small) + dimensionedScalar(magGradU.dimensions(), small) )*sqr(this->kappa_*this->y_) ), scalar(10) @@ -138,7 +138,7 @@ tmp SpalartAllmarasIDDES::dTilda return max ( - dimensionedScalar("small", dimLength, small), + dimensionedScalar(dimLength, small), fHyb*(1 + fRestore*Psi)*this->y_ + (1 - fHyb)*this->CDES_*Psi*this->delta() ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index b05caf3f77..02936f0db8 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C @@ -57,7 +57,7 @@ volScalarField dynamicKEqn::Ck simpleFilter_(0.5*(LL && MM)) /( simpleFilter_(magSqr(MM)) - + dimensionedScalar("small", sqr(MM.dimensions()), vSmall) + + dimensionedScalar(sqr(MM.dimensions()), vSmall) ) ); @@ -93,7 +93,7 @@ volScalarField dynamicKEqn::Ce() const ( 0.5*(filter_(magSqr(this->U_)) - magSqr(filter_(this->U_))) ); - KK.max(dimensionedScalar("small", KK.dimensions(), small)); + KK.max(dimensionedScalar(KK.dimensions(), small)); return Ce(D, KK); } @@ -249,7 +249,7 @@ void dynamicKEqn::correct() tgradU.clear(); volScalarField KK(0.5*(filter_(magSqr(U)) - magSqr(filter_(U)))); - KK.max(dimensionedScalar("small", KK.dimensions(), small)); + KK.max(dimensionedScalar(KK.dimensions(), small)); tmp kEqn ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index 1061a8df4e..9e67bab2d5 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -102,7 +102,7 @@ tmp SpalartAllmaras::fw max ( Stilda, - dimensionedScalar("small", Stilda.dimensions(), small) + dimensionedScalar(Stilda.dimensions(), small) ) *sqr(kappa_*y_) ), @@ -366,7 +366,7 @@ void SpalartAllmaras::correct() fvOptions.constrain(nuTildaEqn.ref()); solve(nuTildaEqn); fvOptions.correct(nuTilda_); - bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0)); + bound(nuTilda_, dimensionedScalar(nuTilda_.dimensions(), 0)); nuTilda_.correctBoundaryConditions(); correctNut(fv1); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index 3d7c59d9d0..d18490982b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C @@ -454,7 +454,7 @@ kOmegaSSTLM::kOmegaSSTLM this->mesh_ ), this->mesh_, - dimensionedScalar("0", dimless, 0) + dimensionedScalar(dimless, 0) ) {} diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 8e5a902eda..f7dfd7b9db 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -79,7 +79,7 @@ tmp kOmegaSSTSAS::Qsas magSqr(fvc::grad(this->omega_)()())/sqr(this->omega_()), magSqr(fvc::grad(this->k_)()())/sqr(this->k_()) ), - dimensionedScalar("0", dimensionSet(0, 0, -2, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 0, -2, 0, 0), 0) ), // Limit SAS production of omega for numerical stability, // particularly during start-up diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C index 27aca2cab9..7d4e2e0f53 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C @@ -52,7 +52,7 @@ tmp realizableKE::rCmu (2*sqrt(2.0))*((S&S)&&S) /( magS*S2 - + dimensionedScalar("small", dimensionSet(0, 0, -3, 0, 0), small) + + dimensionedScalar(dimensionSet(0, 0, -3, 0, 0), small) ) ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index e8838253c5..8038eea4ab 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C @@ -230,8 +230,8 @@ v2f::v2f ), this->mesh_ ), - v2Min_(dimensionedScalar("v2Min", v2_.dimensions(), small)), - fMin_(dimensionedScalar("fMin", f_.dimensions(), 0)) + v2Min_(dimensionedScalar(v2_.dimensions(), small)), + fMin_(dimensionedScalar(f_.dimensions(), 0)) { bound(k_, this->kMin_); bound(epsilon_, this->epsilonMin_); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 27d73c93cd..e2a42edfad 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -119,7 +119,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights() false // do not register ), mesh, - dimensionedScalar("zero", dimless, 0) + dimensionedScalar(dimless, 0) ); DynamicList