diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H index d811d4be86..6cafd11a6f 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H @@ -3,7 +3,6 @@ PtrList thermoFluid(fluidRegions.size()); PtrList rhoFluid(fluidRegions.size()); PtrList UFluid(fluidRegions.size()); PtrList phiFluid(fluidRegions.size()); -PtrList gFluid(fluidRegions.size()); PtrList hRefFluid(fluidRegions.size()); PtrList ghFluid(fluidRegions.size()); PtrList ghfFluid(fluidRegions.size()); @@ -22,6 +21,8 @@ PtrList rhoMin(fluidRegions.size()); PtrList MRFfluid(fluidRegions.size()); PtrList fluidFvOptions(fluidRegions.size()); +const uniformDimensionedVectorField& g = meshObjects::gravity::New(runTime); + // Populate fluid field pointer lists forAll(fluidRegions, i) { @@ -91,23 +92,6 @@ forAll(fluidRegions, i) ) ); - Info<< " Adding to gFluid\n" << endl; - gFluid.set - ( - i, - new uniformDimensionedVectorField - ( - IOobject - ( - "g", - runTime.constant(), - fluidRegions[i], - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ) - ); - Info<< " Adding to hRefFluid\n" << endl; hRefFluid.set ( @@ -128,10 +112,9 @@ forAll(fluidRegions, i) dimensionedScalar ghRef ( - mag(gFluid[i].value()) > SMALL - ? gFluid[i] - & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i] - : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0) + mag(g.value()) > SMALL + ? g & (cmptMag(g.value())/mag(g.value()))*hRefFluid[i] + : dimensionedScalar("ghRef", g.dimensions()*dimLength, 0) ); Info<< " Adding to ghFluid\n" << endl; @@ -141,7 +124,7 @@ forAll(fluidRegions, i) new volScalarField ( "gh", - (gFluid[i] & fluidRegions[i].C()) - ghRef + (g & fluidRegions[i].C()) - ghRef ) ); @@ -152,7 +135,7 @@ forAll(fluidRegions, i) new surfaceScalarField ( "ghf", - (gFluid[i] & fluidRegions[i].Cf()) - ghRef + (g & fluidRegions[i].Cf()) - ghRef ) ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H index 119c2ad7ea..814c930275 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H @@ -14,7 +14,6 @@ volScalarField& p_rgh = p_rghFluid[i]; - const dimensionedVector& g = gFluid[i]; const volScalarField& gh = ghFluid[i]; const surfaceScalarField& ghf = ghfFluid[i]; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C index 70ddd04270..a8351cc376 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,6 +25,7 @@ License #include "phasePair.H" #include "surfaceTensionModel.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -53,7 +54,7 @@ Foam::phasePair::phasePair phasePairKey(phase1.name(), phase2.name(), ordered), phase1_(phase1), phase2_(phase2), - g_(phase1.mesh().lookupObject("g")) + g_(meshObjects::gravity::New(phase1.db().time())) {} diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C index 28b3dfe832..3c1c176d84 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License #include "KocamustafaogullariIshii.H" #include "addToRunTimeSelectionTable.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "compressibleTurbulenceModel.H" #include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" @@ -87,7 +87,7 @@ KocamustafaogullariIshii::dDeparture { // Gravitational acceleration const uniformDimensionedVectorField& g = - liquid.mesh().lookupObject("g"); + meshObjects::gravity::New(liquid.mesh().time()); const fvPatchScalarField& rhoLiquid = liquid.turbulence().rho().boundaryField()[patchi]; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C index b6584caf5f..d72c07c8ac 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License #include "Cole.H" #include "addToRunTimeSelectionTable.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "compressibleTurbulenceModel.H" #include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" @@ -52,8 +52,10 @@ namespace departureFrequencyModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::wallBoilingModels::departureFrequencyModels:: -Cole::Cole(const dictionary& dict) +Foam::wallBoilingModels::departureFrequencyModels::Cole::Cole +( + const dictionary& dict +) : departureFrequencyModel() {} @@ -61,16 +63,14 @@ Cole::Cole(const dictionary& dict) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::wallBoilingModels::departureFrequencyModels:: -Cole::~Cole() +Foam::wallBoilingModels::departureFrequencyModels::Cole::~Cole() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::wallBoilingModels::departureFrequencyModels:: -Cole::fDeparture +Foam::wallBoilingModels::departureFrequencyModels::Cole::fDeparture ( const phaseModel& liquid, const phaseModel& vapor, @@ -80,7 +80,7 @@ Cole::fDeparture { // Gravitational acceleration const uniformDimensionedVectorField& g = - liquid.mesh().lookupObject("g"); + meshObjects::gravity::New(liquid.mesh().time()); const fvPatchScalarField& rhoLiquid = liquid.turbulence().rho().boundaryField()[patchi]; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 18a941099a..507d17285d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -26,7 +26,7 @@ License #include "IATEsource.H" #include "fvMatrix.H" #include "phaseCompressibleTurbulenceModel.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -54,12 +54,12 @@ Foam::diameterModels::IATEsource::New if (!cstrIter.found()) { - FatalErrorInFunction + FatalIOErrorInFunction(dict) << "Unknown IATE source type " << type << nl << nl - << "Valid IATE source types :" << endl + << "Valid IATE source types :" << nl << dictionaryConstructorTablePtr_->sortedToc() - << exit(FatalError); + << exit(FatalIOError); } return autoPtr(cstrIter()(iate, dict)); @@ -71,7 +71,7 @@ Foam::diameterModels::IATEsource::New Foam::tmp Foam::diameterModels::IATEsource::Ur() const { const uniformDimensionedVectorField& g = - phase().db().lookupObject("g"); + meshObjects::gravity::New(phase().db().time()); return sqrt(2.0) @@ -84,16 +84,19 @@ Foam::tmp Foam::diameterModels::IATEsource::Ur() const *pow(max(1 - phase(), scalar(0)), 1.75); } + Foam::tmp Foam::diameterModels::IATEsource::Ut() const { return sqrt(2*otherPhase().turbulence().k()); } + Foam::tmp Foam::diameterModels::IATEsource::Re() const { return max(Ur()*phase().d()/otherPhase().nu(), scalar(1.0e-3)); } + Foam::tmp Foam::diameterModels::IATEsource::CD() const { const volScalarField Eo(this->Eo()); @@ -111,10 +114,11 @@ Foam::tmp Foam::diameterModels::IATEsource::CD() const ); } + Foam::tmp Foam::diameterModels::IATEsource::Mo() const { const uniformDimensionedVectorField& g = - phase().db().lookupObject("g"); + meshObjects::gravity::New(phase().db().time()); return mag(g)*pow4(otherPhase().nu())*sqr(otherPhase().rho()) @@ -122,10 +126,11 @@ Foam::tmp Foam::diameterModels::IATEsource::Mo() const /pow3(fluid().sigma()); } + Foam::tmp Foam::diameterModels::IATEsource::Eo() const { const uniformDimensionedVectorField& g = - phase().db().lookupObject("g"); + meshObjects::gravity::New(phase().db().time()); return mag(g)*sqr(phase().d()) @@ -133,6 +138,7 @@ Foam::tmp Foam::diameterModels::IATEsource::Eo() const /fluid().sigma(); } + Foam::tmp Foam::diameterModels::IATEsource::We() const { return diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index c77c7e7e99..fe53ffe6ce 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -27,7 +27,7 @@ License #include "twoPhaseSystem.H" #include "fvMatrix.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -55,12 +55,12 @@ Foam::diameterModels::IATEsource::New if (!cstrIter.found()) { - FatalErrorInFunction + FatalIOErrorInFunction(dict) << "Unknown IATE source type " << type << nl << nl - << "Valid IATE source types :" << endl + << "Valid IATE source types :" << nl << dictionaryConstructorTablePtr_->sortedToc() - << exit(FatalError); + << exit(FatalIOError); } return autoPtr(cstrIter()(iate, dict)); @@ -72,7 +72,7 @@ Foam::diameterModels::IATEsource::New Foam::tmp Foam::diameterModels::IATEsource::Ur() const { const uniformDimensionedVectorField& g = - phase().U().db().lookupObject("g"); + meshObjects::gravity::New(phase().U().time()); return sqrt(2.0) @@ -85,16 +85,19 @@ Foam::tmp Foam::diameterModels::IATEsource::Ur() const *pow(max(1 - phase(), scalar(0)), 1.75); } + Foam::tmp Foam::diameterModels::IATEsource::Ut() const { return sqrt(2*otherPhase().turbulence().k()); } + Foam::tmp Foam::diameterModels::IATEsource::Re() const { return max(Ur()*phase().d()/otherPhase().nu(), scalar(1.0e-3)); } + Foam::tmp Foam::diameterModels::IATEsource::CD() const { const volScalarField Eo(this->Eo()); @@ -112,10 +115,11 @@ Foam::tmp Foam::diameterModels::IATEsource::CD() const ); } + Foam::tmp Foam::diameterModels::IATEsource::Mo() const { const uniformDimensionedVectorField& g = - phase().U().db().lookupObject("g"); + meshObjects::gravity::New(phase().U().time()); return mag(g)*pow4(otherPhase().nu())*sqr(otherPhase().rho()) @@ -123,10 +127,11 @@ Foam::tmp Foam::diameterModels::IATEsource::Mo() const /pow3(fluid().sigma()); } + Foam::tmp Foam::diameterModels::IATEsource::Eo() const { const uniformDimensionedVectorField& g = - phase().U().db().lookupObject("g"); + meshObjects::gravity::New(phase().U().time()); return mag(g)*sqr(phase().d()) @@ -134,6 +139,7 @@ Foam::tmp Foam::diameterModels::IATEsource::Eo() const /fluid().sigma(); } + Foam::tmp Foam::diameterModels::IATEsource::We() const { return otherPhase().rho()*sqr(Ur())*phase().d()/fluid().sigma(); diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C index b78dddf279..06b159d008 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C +++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "buoyantKEpsilon.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "fvcGrad.H" #include "addToRunTimeSelectionTable.H" @@ -102,8 +102,7 @@ tmp buoyantKEpsilon::Gcoef() const { const uniformDimensionedVectorField& g = - this->mesh_.objectRegistry::template - lookupObject("g"); + meshObjects::gravity::New(this->mesh_.time()); return (Cg_*this->Cmu_)*this->alpha_*this->k_*(g & fvc::grad(this->rho_)) @@ -116,8 +115,7 @@ tmp buoyantKEpsilon::kSource() const { const uniformDimensionedVectorField& g = - this->mesh_.objectRegistry::template - lookupObject("g"); + meshObjects::gravity::New(this->mesh_.time()); if (mag(g.value()) > SMALL) { @@ -135,8 +133,7 @@ tmp buoyantKEpsilon::epsilonSource() const { const uniformDimensionedVectorField& g = - this->mesh_.objectRegistry::template - lookupObject("g"); + meshObjects::gravity::New(this->mesh_.time()); if (mag(g.value()) > SMALL) { diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C index 99cd84fd4e..fbbdb6fb68 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -145,7 +145,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs() ); const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); // scalar rhor = 1000; // scalarField alphap1 = max(min(alphap, scalar(1)), scalar(0)); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C index e365010fa1..b5c8d41456 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -150,7 +150,7 @@ void Foam::prghPressureFvPatchScalarField::updateCoeffs() ); const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); const uniformDimensionedScalarField& hRef = db().lookupObject("hRef"); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C index feeed48433..3c8d1623ea 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,12 +28,11 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::prghTotalPressureFvPatchScalarField:: -prghTotalPressureFvPatchScalarField +Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -47,8 +46,7 @@ prghTotalPressureFvPatchScalarField {} -Foam::prghTotalPressureFvPatchScalarField:: -prghTotalPressureFvPatchScalarField +Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -75,8 +73,7 @@ prghTotalPressureFvPatchScalarField } -Foam::prghTotalPressureFvPatchScalarField:: -prghTotalPressureFvPatchScalarField +Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField ( const prghTotalPressureFvPatchScalarField& ptf, const fvPatch& p, @@ -92,8 +89,7 @@ prghTotalPressureFvPatchScalarField {} -Foam::prghTotalPressureFvPatchScalarField:: -prghTotalPressureFvPatchScalarField +Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField ( const prghTotalPressureFvPatchScalarField& ptf ) @@ -106,8 +102,7 @@ prghTotalPressureFvPatchScalarField {} -Foam::prghTotalPressureFvPatchScalarField:: -prghTotalPressureFvPatchScalarField +Foam::prghTotalPressureFvPatchScalarField::prghTotalPressureFvPatchScalarField ( const prghTotalPressureFvPatchScalarField& ptf, const DimensionedField& iF @@ -165,7 +160,7 @@ void Foam::prghTotalPressureFvPatchScalarField::updateCoeffs() patch().lookupPatchField(UName_); const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); const uniformDimensionedScalarField& hRef = db().lookupObject("hRef"); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C index f8c6a08e08..da8bed8b27 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -27,8 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "surfaceFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -126,7 +125,7 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::updateCoeffs() } const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); operator== ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index d032b31af8..1da8d790f4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "EulerDdtScheme.H" #include "CrankNicolsonDdtScheme.H" #include "backwardDdtScheme.H" @@ -143,22 +143,22 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() const scalar dt = db().time().deltaTValue(); - // retrieve non-const access to zeta field from the database + // Retrieve non-const access to zeta field from the database volVectorField& zeta = db().lookupObjectRef(zetaName_); vectorField& zetap = zeta.boundaryFieldRef()[patchi]; - // lookup d/dt scheme from database for zeta + // Lookup d/dt scheme from database for zeta const word ddtSchemeName(zeta.mesh().ddtScheme(zeta.name())); ddtSchemeType ddtScheme(ddtSchemeTypeNames_[ddtSchemeName]); - // retrieve the flux field from the database + // Retrieve the flux field from the database const surfaceScalarField& phi = db().lookupObject(phiName_); - // cache the patch face-normal vectors + // Cache the patch face-normal vectors tmp nf(patch().nf()); - // change in zeta due to flux + // Change in zeta due to flux vectorField dZetap(dt*nf()*phi.boundaryField()[patchi]/patch().magSf()); if (phi.dimensions() == dimDensity*dimVelocity*dimArea) @@ -212,9 +212,9 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() Info<< "min/max zetap = " << gMin(zetap & nf()) << ", " << gMax(zetap & nf()) << endl; - // update the surface pressure + // Update the surface pressure const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); operator==(-g.value() & zetap); diff --git a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C index ccaf93b7e7..f1d3346249 100644 --- a/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C +++ b/src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,6 +25,7 @@ License #include "icoUncoupledKinematicCloud.H" #include "singlePhaseTransportModel.H" +#include "gravityMeshObject.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -54,18 +55,7 @@ Foam::functionObjects::icoUncoupledKinematicCloud::icoUncoupledKinematicCloud ) : fvMeshFunctionObject(name, runTime, dict), - g_ - ( - IOobject - ( - "g", - time_.constant(), - mesh_, - IOobject::READ_IF_PRESENT, - IOobject::NO_WRITE - ), - dimensionedVector("g", dimAcceleration, Zero) // Needs name - ), + g_(meshObjects::gravity::New(time_)), laminarTransport_ ( mesh_.lookupObject("transportProperties") diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C index 86236e8995..7685cd0e85 100644 --- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C +++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,6 +25,7 @@ License #include "buoyancyEnergy.H" #include "fvMatrices.H" +#include "gravityMeshObject.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // @@ -80,7 +81,7 @@ void Foam::fv::buoyancyEnergy::addSup ) { const uniformDimensionedVectorField& g = - mesh_.lookupObject("g"); + meshObjects::gravity::New(mesh_.time()); const volVectorField& U = mesh_.lookupObject(UName_); diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C index bb4e098e81..1dc38336b9 100644 --- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C +++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -26,6 +26,7 @@ License #include "buoyancyForce.H" #include "fvMatrices.H" #include "addToRunTimeSelectionTable.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // @@ -56,17 +57,7 @@ Foam::fv::buoyancyForce::buoyancyForce ) : option(sourceName, modelType, dict, mesh), - g_ - ( - IOobject - ( - "g", - mesh.time().constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ) + g_(meshObjects::gravity::New(mesh.time())) { coeffs_.readEntry("fields", fieldNames_); diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C index f332f4d2b9..9a405dd2c5 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -26,7 +26,7 @@ License #include "solidificationMeltingSource.H" #include "fvMatrices.H" #include "basicThermo.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "zeroGradientFvPatchFields.H" #include "extrapolatedCalculatedFvPatchFields.H" #include "addToRunTimeSelectionTable.H" @@ -120,19 +120,6 @@ Foam::fv::solidificationMeltingSource::Cp() const } -Foam::vector Foam::fv::solidificationMeltingSource::g() const -{ - if (mesh_.foundObject("g")) - { - const uniformDimensionedVectorField& value = - mesh_.lookupObject("g"); - return value.value(); - } - - return coeffs_.get("g"); -} - - void Foam::fv::solidificationMeltingSource::update(const volScalarField& Cp) { if (curTimeIndex_ == mesh_.time().timeIndex()) @@ -276,7 +263,7 @@ void Foam::fv::solidificationMeltingSource::addSup update(Cp); - vector g = this->g(); + const vector& g = meshObjects::gravity::New(mesh_.time()).value(); scalarField& Sp = eqn.diag(); vectorField& Su = eqn.source(); diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H index 829e46b655..7e30d636e6 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -180,9 +180,6 @@ private: //- Return the specific heat capacity field tmp Cp() const; - //- Return the gravity vector - vector g() const; - //- Update the model void update(const volScalarField& Cp); diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C index e8eb54dc16..70dceaf359 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C @@ -64,9 +64,9 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource fieldNames_.setSize(1, UName_); applied_.setSize(1, false); - if (mesh.foundObject("g")) + if (mesh.time().foundObject("g")) { - g0_ = mesh.lookupObject("g"); + g0_ = mesh.time().lookupObject("g"); } } diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C index 8ef5b614b1..5f5a0bd2cd 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSourceTemplates.C @@ -41,10 +41,10 @@ void Foam::fv::tabulatedAccelerationSource::addSup Vector acceleration(motion_.acceleration()); // If gravitational force is present combine with the linear acceleration - if (mesh_.foundObject("g")) + if (mesh_.time().foundObject("g")) { uniformDimensionedVectorField& g = - mesh_.lookupObjectRef("g"); + mesh_.time().lookupObjectRef("g"); const uniformDimensionedScalarField& hRef = mesh_.lookupObject("hRef"); diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C index 14d9ec9f48..d7729f8ac5 100644 --- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C +++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C @@ -241,10 +241,10 @@ void Foam::rigidBodyMeshMotion::solve() const scalar ramp = ramp_->value(t.value()); - if (db().foundObject("g")) + if (t.foundObject("g")) { model_.g() = - ramp*db().lookupObject("g").value(); + ramp*t.lookupObject("g").value(); } if (test_) diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C index 5d341b942b..33f2b4dfea 100644 --- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C +++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C @@ -189,10 +189,9 @@ void Foam::rigidBodyMeshMotionSolver::solve() curTimeIndex_ = this->db().time().timeIndex(); } - if (db().foundObject("g")) + if (t.foundObject("g")) { - model_.g() = - db().lookupObject("g").value(); + model_.g() = t.lookupObject("g").value(); } if (test_) diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C index 22a934c62e..aab4f570ed 100644 --- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C +++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C @@ -174,7 +174,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs() if (lookupGravity_ < 0) { - if (db().foundObject("g")) + if (db().time().foundObject("g")) { if (lookupGravity_ == -2) { @@ -225,7 +225,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs() if (lookupGravity_ == 1) { uniformDimensionedVectorField g = - db().lookupObject("g"); + db().time().lookupObject("g"); g_ = g.value(); } diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C index 4031fb2764..2b8d0fa711 100644 --- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C +++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C @@ -162,10 +162,10 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs() vector gravity = Zero; - if (db().foundObject("g")) + if (db().time().foundObject("g")) { uniformDimensionedVectorField g = - db().lookupObject("g"); + db().time().lookupObject("g"); gravity = g.value(); } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C index 33df1f5824..d0892f2277 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C @@ -189,9 +189,9 @@ void Foam::sixDoFRigidBodyMotionSolver::solve() dimensionedVector g("g", dimAcceleration, Zero); - if (db().foundObject("g")) + if (db().time().foundObject("g")) { - g = db().lookupObject("g"); + g = db().time().lookupObject("g"); } else { diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C index bec15a012a..e938e35de9 100644 --- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C +++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C @@ -28,7 +28,7 @@ License #include "vectorList.H" #include "addToRunTimeSelectionTable.H" #include "boundaryRadiationProperties.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "cyclicAMIPolyPatch.H" #include "mappedPatchBase.H" #include "wallPolyPatch.H" @@ -298,10 +298,10 @@ void Foam::radiation::solarLoad::initialise(const dictionary& coeffs) { verticalDir_.normalise(); } - else if (mesh_.foundObject("g")) + else { const uniformDimensionedVectorField& g = - mesh_.lookupObject("g"); + meshObjects::gravity::New(mesh_.time()); verticalDir_ = (-g/mag(g)).value(); } diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C index 3eb505dfa1..71a4e94b61 100644 --- a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -141,7 +141,7 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs() } const uniformDimensionedVectorField& g = - db().lookupObject("g"); + meshObjects::gravity::New(db().time()); const fvPatchField& rho = patch().lookupPatchField("rho"); diff --git a/src/waveModels/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C index 9d340922b7..1082047c35 100644 --- a/src/waveModels/waveModel/waveModel.C +++ b/src/waveModels/waveModel/waveModel.C @@ -26,7 +26,7 @@ License #include "waveModel.H" #include "fvMesh.H" #include "polyPatch.H" -#include "uniformDimensionedFields.H" +#include "gravityMeshObject.H" #include "volFields.H" #include "fvPatchFields.H" @@ -261,7 +261,7 @@ Foam::waveModel::waveModel ), mesh_(mesh), patch_(patch), - g_(mesh.lookupObject("g").value()), + g_(meshObjects::gravity::New(mesh.time()).value()), UName_("U"), alphaName_("alpha"), Rgl_(tensor::I),