diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index 31abf12308..c37d6a61bf 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -750,6 +750,7 @@ template class PatchField, class GeoMesh> Foam::tmp> Foam::GeometricField::New ( + const word& name, const Mesh& mesh, const dimensioned& dt, const word& patchFieldType @@ -761,7 +762,7 @@ Foam::GeometricField::New ( IOobject ( - dt.name(), + name, mesh.time().timeName(), mesh, IOobject::NO_READ, @@ -776,6 +777,40 @@ Foam::GeometricField::New } + +template class PatchField, class GeoMesh> +Foam::tmp> +Foam::GeometricField::New +( + const word& name, + const Mesh& mesh, + const dimensioned& dt, + const wordList& patchFieldTypes, + const wordList& actualPatchTypes +) +{ + return tmp> + ( + new GeometricField + ( + IOobject + ( + name, + mesh.time().timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE, + false + ), + mesh, + dt, + patchFieldTypes, + actualPatchTypes + ) + ); +} + + template class PatchField, class GeoMesh> Foam::tmp> Foam::GeometricField::New diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H index 2e1053aef5..c267e91764 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H @@ -446,11 +446,23 @@ public: // and patch type. static tmp> New ( + const word& name, const Mesh&, const dimensioned&, const word& patchFieldType=PatchField::calculatedType() ); + //- Return a temporary field constructed from mesh, dimensioned + // and patch types. + static tmp> New + ( + const word& name, + const Mesh&, + const dimensioned&, + const wordList& patchFieldTypes, + const wordList& actualPatchTypes = wordList() + ); + //- Rename temporary field and return static tmp> New ( diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C index 78af871bc1..4534ff3fe2 100644 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C +++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C @@ -120,12 +120,9 @@ Foam::ThermalDiffusivity::alphat() const { return volScalarField::New ( + IOobject::groupName("alphat", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("alphat", this->alphaRhoPhi_.group()), - dimDensity*dimViscosity, 0 - ) + dimensionedScalar(dimDensity*dimViscosity, 0) ); } diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C index 70cc424a47..a826b1d8a2 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C @@ -106,13 +106,9 @@ Foam::PhaseCompressibleTurbulenceModel::pPrime() const { return volScalarField::New ( + IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), - dimPressure, - 0 - ) + dimensionedScalar(dimPressure, 0) ); } @@ -123,13 +119,9 @@ Foam::PhaseCompressibleTurbulenceModel::pPrimef() const { return surfaceScalarField::New ( + IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), - dimPressure, - 0 - ) + dimensionedScalar(dimPressure, 0) ); } diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C index b53bd90337..0723a41cb5 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C @@ -105,13 +105,9 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrime() const { return volScalarField::New ( + IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), - dimPressure, - 0 - ) + dimensionedScalar(dimPressure, 0) ); } @@ -122,13 +118,9 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrimef() const { return surfaceScalarField::New ( + IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), - dimPressure, - 0 - ) + dimensionedScalar(dimPressure, 0) ); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C index e13a46c193..8011e369d2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C @@ -53,8 +53,9 @@ void Foam::LESModels::IDDESDelta::calcDelta() ( volScalarField::New ( + "faceToFaceMax", mesh, - dimensionedScalar("faceToFaceMax", dimLength, 0) + dimensionedScalar(dimLength, 0) ) ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index af3e60bf6a..9ad6d2c962 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -305,8 +305,9 @@ tmp SpalartAllmaras::k() const { return volScalarField::New ( + "k", this->mesh_, - dimensionedScalar("k", dimensionSet(0, 2, -2, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -2, 0, 0), 0) ); } @@ -321,8 +322,9 @@ tmp SpalartAllmaras::epsilon() const return volScalarField::New ( + "epsilon", this->mesh_, - dimensionedScalar("epsilon", dimensionSet(0, 2, -3, 0, 0), 0) + dimensionedScalar(dimensionSet(0, 2, -3, 0, 0), 0) ); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index a4342604a5..3d7c59d9d0 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C @@ -85,20 +85,17 @@ tmp kOmegaSSTLM::Fthetat const volScalarField::Internal ReOmega(sqr(y)*omega/nu); const volScalarField::Internal Fwake(exp(-sqr(ReOmega/1e5))); - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal + IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()), + min ( - IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()), - min + max ( - max - ( - Fwake*exp(-pow4((y/delta))), - (1 - sqr((gammaInt_() - 1.0/ce2_)/(1 - 1.0/ce2_))) - ), - scalar(1) - ) + Fwake*exp(-pow4((y/delta))), + (1 - sqr((gammaInt_() - 1.0/ce2_)/(1 - 1.0/ce2_))) + ), + scalar(1) ) ); } @@ -110,14 +107,9 @@ kOmegaSSTLM::ReThetac() const { tmp tReThetac ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), + IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()), this->mesh_, dimless ) @@ -153,14 +145,9 @@ tmp kOmegaSSTLM::Flength { tmp tFlength ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - IOobject::groupName("Flength", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), + IOobject::groupName("Flength", this->alphaRhoPhi_.group()), this->mesh_, dimless ) @@ -218,14 +205,9 @@ tmp kOmegaSSTLM::ReThetat0 { tmp tReThetat0 ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - IOobject::groupName("ReThetat0", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), + IOobject::groupName("ReThetat0", this->alphaRhoPhi_.group()), this->mesh_, dimless ) @@ -339,13 +321,10 @@ tmp kOmegaSSTLM::Fonset const volScalarField::Internal Fonset3(max(1 - pow3(RT/2.5), scalar(0))); - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject::groupName("Fonset", this->alphaRhoPhi_.group()), - max(Fonset2 - Fonset3, scalar(0)) - ) + IOobject::groupName("Fonset", this->alphaRhoPhi_.group()), + max(Fonset2 - Fonset3, scalar(0)) ); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C index e0b904708a..80421c39b3 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C @@ -88,13 +88,9 @@ Stokes::nut() const { return volScalarField::New ( + IOobject::groupName("nut", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("nut", this->alphaRhoPhi_.group()), - dimViscosity, - 0 - ) + dimensionedScalar(dimViscosity, 0) ); } @@ -142,13 +138,9 @@ Stokes::k() const { return volScalarField::New ( + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions()), 0) ); } @@ -159,13 +151,9 @@ Stokes::epsilon() const { return volScalarField::New ( + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions())/dimTime, - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions())/dimTime, 0) ); } @@ -176,13 +164,9 @@ Stokes::R() const { return volSymmTensorField::New ( + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedSymmTensor - ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - Zero - ) + dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) ); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C index 083c7c9614..b03c01649a 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C @@ -113,13 +113,9 @@ generalizedNewtonian::nut() const { return volScalarField::New ( + IOobject::groupName("nut", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("nut", this->alphaRhoPhi_.group()), - dimViscosity, - 0 - ) + dimensionedScalar(dimViscosity, 0) ); } @@ -167,13 +163,9 @@ generalizedNewtonian::k() const { return volScalarField::New ( + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions()), 0) ); } @@ -184,13 +176,9 @@ generalizedNewtonian::epsilon() const { return volScalarField::New ( + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions())/dimTime, - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions())/dimTime, 0) ); } @@ -201,13 +189,9 @@ generalizedNewtonian::R() const { return volSymmTensorField::New ( + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedSymmTensor - ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - Zero - ) + dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) ); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C index 7f8353c4cf..ddb16642ca 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C @@ -104,13 +104,9 @@ nu ( volScalarField::New ( + IOobject::groupName(type() + ":nu", nu0.group()), nu0.mesh(), - dimensionedScalar - ( - IOobject::groupName(type() + ":nu", nu0.group()), - dimViscosity, - 0 - ) + dimensionedScalar(dimViscosity, 0) ) ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index 02db624f29..475e1f9845 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -187,13 +187,9 @@ Foam::laminarModel::nut() const { return volScalarField::New ( + IOobject::groupName("nut", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("nut", this->alphaRhoPhi_.group()), - dimViscosity, - 0 - ) + dimensionedScalar(dimViscosity, 0) ); } @@ -241,13 +237,9 @@ Foam::laminarModel::k() const { return volScalarField::New ( + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions()), 0) ); } @@ -258,13 +250,9 @@ Foam::laminarModel::epsilon() const { return volScalarField::New ( + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedScalar - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions())/dimTime, - 0 - ) + dimensionedScalar(sqr(this->U_.dimensions())/dimTime, 0) ); } @@ -275,13 +263,9 @@ Foam::laminarModel::R() const { return volSymmTensorField::New ( + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->mesh_, - dimensionedSymmTensor - ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), - sqr(this->U_.dimensions()), - Zero - ) + dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) ); } diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H index 41208ff74a..1237c14d04 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H @@ -184,26 +184,20 @@ public: //- Return the effective diffusivity for k tmp DkEff() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - "DkEff", - (this->nut_/sigmak_ + this->nu()) - ) + "DkEff", + (this->nut_/sigmak_ + this->nu()) ); } //- Return the effective diffusivity for epsilon tmp DepsilonEff() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - "DepsilonEff", - (this->nut_/sigmaEps_ + this->nu()) - ) + "DepsilonEff", + (this->nut_/sigmaEps_ + this->nu()) ); } diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C index 33bac81b3e..4544931fe9 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneList.C @@ -168,16 +168,11 @@ Foam::tmp Foam::MRFZoneList::DDt { tmp tacceleration ( - new volVectorField + volVectorField::New ( - IOobject - ( - "MRFZoneList:acceleration", - U.mesh().time().timeName(), - U.mesh() - ), + "MRFZoneList:acceleration", U.mesh(), - dimensionedVector("0", U.dimensions()/dimTime, Zero) + dimensionedVector(U.dimensions()/dimTime, Zero) ) ); volVectorField& acceleration = tacceleration.ref(); diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C index 6ceba22131..32e09bfdc5 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C @@ -185,21 +185,10 @@ Foam::vectorField Foam::SRF::SRFModel::velocity Foam::tmp Foam::SRF::SRFModel::U() const { - return tmp + return volVectorField::New ( - new volVectorField - ( - IOobject - ( - "Usrf", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - omega_ - ^ ((mesh_.C() - origin_) - axis_*(axis_ & (mesh_.C() - origin_))) - ) + "Usrf", + omega_ ^ ((mesh_.C() - origin_) - axis_*(axis_ & (mesh_.C() - origin_))) ); } @@ -210,19 +199,7 @@ Foam::tmp Foam::SRF::SRFModel::Uabs() const tmp tUabs ( - new volVectorField - ( - IOobject - ( - "Uabs", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - Usrf - ) + volVectorField::New("Uabs", Usrf) ); volVectorField& Uabs = tUabs.ref(); diff --git a/src/finiteVolume/cfdTools/general/levelSet/levelSet.C b/src/finiteVolume/cfdTools/general/levelSet/levelSet.C index e0904efcc6..493e2c809e 100644 --- a/src/finiteVolume/cfdTools/general/levelSet/levelSet.C +++ b/src/finiteVolume/cfdTools/general/levelSet/levelSet.C @@ -154,16 +154,11 @@ Foam::tmp Foam::levelSetFraction tmp tResult ( - new volScalarField + volScalarField::New ( - IOobject - ( - "levelSetFraction", - mesh.time().timeName(), - mesh - ), + "levelSetFraction", mesh, - dimensionedScalar("0", dimless, 0) + dimensionedScalar(dimless, 0) ) ); volScalarField& result = tResult.ref(); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index 30ddd138f0..d9589a878a 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -47,16 +47,11 @@ tmp CoEulerDdtScheme::CorDeltaT() const tmp tcorDeltaT ( - new volScalarField + volScalarField::New ( - IOobject - ( - "CorDeltaT", - cofrDeltaT.instance(), - mesh() - ), + "CorDeltaT", mesh(), - dimensionedScalar("CorDeltaT", cofrDeltaT.dimensions(), 0.0), + dimensionedScalar(cofrDeltaT.dimensions(), 0), extrapolatedCalculatedFvPatchScalarField::typeName ) ); @@ -834,21 +829,11 @@ tmp CoEulerDdtScheme::meshPhi const GeometricField& ) { - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - "meshPhi", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh(), - dimensionedScalar("0", dimVolume/dimTime, 0.0) - ) + "meshPhi", + mesh(), + dimensionedScalar(dimVolume/dimTime, 0.0) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index e70b36aa22..6892f41516 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -1618,21 +1618,10 @@ tmp CrankNicolsonDdtScheme::meshPhi coef0_(meshPhi0)*mesh().phi().oldTime() - offCentre_(meshPhi0()); } - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - mesh().phi().name(), - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - coef_(meshPhi0)*mesh().phi() - offCentre_(meshPhi0()) - ) + mesh().phi().name(), + coef_(meshPhi0)*mesh().phi() - offCentre_(meshPhi0()) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 4827a74b68..507b2381bb 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -97,16 +97,11 @@ tmp SLTSDdtScheme::SLrDeltaT() const tmp trDeltaT ( - new volScalarField + volScalarField::New ( - IOobject - ( - "rDeltaT", - phi.instance(), - mesh() - ), + "rDeltaT", mesh(), - dimensionedScalar("rDeltaT", dimless/dimTime, 0.0), + dimensionedScalar(dimless/dimTime, 0), extrapolatedCalculatedFvPatchScalarField::typeName ) ); @@ -837,22 +832,11 @@ tmp SLTSDdtScheme::meshPhi const GeometricField& ) { - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - "meshPhi", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh(), - dimensionedScalar("0", dimVolume/dimTime, 0.0) - ) + "meshPhi", + mesh(), + dimensionedScalar(dimVolume/dimTime, 0) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index b5a1d54b84..6863eb001c 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -984,21 +984,10 @@ tmp backwardDdtScheme::meshPhi // Coefficient for t-1/2 (between times n and 0) scalar coefftn_0 = 1 + coefft0_00; - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - mesh().phi().name(), - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - coefftn_0*mesh().phi() - coefft0_00*mesh().phi().oldTime() - ) + mesh().phi().name(), + coefftn_0*mesh().phi() - coefft0_00*mesh().phi().oldTime() ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C index 6eb1710ef4..ea74f120b2 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C @@ -72,16 +72,13 @@ Foam::tmp Foam::fv::localEulerDdt::localRSubDeltaT const label nAlphaSubCycles ) { - return tmp + return volScalarField::New ( - new volScalarField + rSubDeltaTName, + nAlphaSubCycles + *mesh.objectRegistry::lookupObject ( - rSubDeltaTName, - nAlphaSubCycles - *mesh.objectRegistry::lookupObject - ( - rDeltaTName - ) + rDeltaTName ) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index 8ef5fa6d24..52e77d20d5 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -640,22 +640,11 @@ tmp localEulerDdtScheme::meshPhi const GeometricField& ) { - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - "meshPhi", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh(), - dimensionedScalar("0", dimVolume/dimTime, 0.0) - ) + "meshPhi", + mesh(), + dimensionedScalar(dimVolume/dimTime, 0) ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C index d518d48cdb..dad567d3d1 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C @@ -404,22 +404,11 @@ tmp steadyStateDdtScheme::meshPhi const GeometricField& vf ) { - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - IOobject - ( - "meshPhi", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh(), - dimensionedScalar("0", dimVolume/dimTime, 0.0) - ) + "meshPhi", + mesh(), + dimensionedScalar(dimVolume/dimTime, 0) ); } diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C index 4c14bf19cf..2de43e045e 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C @@ -46,18 +46,15 @@ Foam::fvc::cellReduce tmp tresult ( - new volFieldType + volFieldType::New ( - IOobject - ( - "cellReduce(" + ssf.name() + ')', - ssf.instance(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "cellReduce(" + ssf.name() + ')', mesh, - dimensioned("initialValue", ssf.dimensions(), nullValue), + dimensioned + ( + ssf.dimensions(), + nullValue + ), extrapolatedCalculatedFvPatchField::typeName ) ); diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C index bd033b3d24..af3682d5df 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C @@ -55,20 +55,12 @@ tmp reconstructMag(const surfaceScalarField& ssf) tmp treconField ( - new volScalarField + volScalarField::New ( - IOobject - ( - "reconstruct("+ssf.name()+')', - ssf.instance(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "reconstruct("+ssf.name()+')', mesh, dimensionedScalar ( - "0", ssf.dimensions()/dimArea, scalar(0) ), diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 08a301caf7..29b7d05057 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -739,16 +739,9 @@ Foam::tmp Foam::fvMatrix::A() const { tmp tAphi ( - new volScalarField + volScalarField::New ( - IOobject - ( - "A("+psi_.name()+')', - psi_.instance(), - psi_.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "A("+psi_.name()+')', psi_.mesh(), dimensions_/psi_.dimensions()/dimVol, extrapolatedCalculatedFvPatchScalarField::typeName @@ -830,16 +823,9 @@ Foam::tmp Foam::fvMatrix::H1() const { tmp tH1 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "H(1)", - psi_.instance(), - psi_.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "H(1)", psi_.mesh(), dimensions_/(dimVol*psi_.dimensions()), extrapolatedCalculatedFvPatchScalarField::typeName diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C index 6aa61c7d78..f55d00b939 100644 --- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C +++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C @@ -212,16 +212,9 @@ Foam::tmp Foam::fvMatrix::H() const { tmp tHphi ( - new volScalarField + volScalarField::New ( - IOobject - ( - "H("+psi_.name()+')', - psi_.instance(), - psi_.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "H("+psi_.name()+')', psi_.mesh(), dimensions_/dimVol, extrapolatedCalculatedFvPatchScalarField::typeName @@ -244,16 +237,9 @@ Foam::tmp Foam::fvMatrix::H1() const { tmp tH1 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "H(1)", - psi_.instance(), - psi_.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "H(1)", psi_.mesh(), dimensions_/(dimVol*psi_.dimensions()), extrapolatedCalculatedFvPatchScalarField::typeName diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C index 2e8ec506a8..3b4539ff78 100644 --- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C +++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/Poisson/PoissonPatchDistMethod.C @@ -80,16 +80,11 @@ bool Foam::patchDistMethods::Poisson::correct { tyPsi_ = tmp ( - new volScalarField + volScalarField::New ( - IOobject - ( - "yPsi", - mesh_.time().timeName(), - mesh_ - ), + "yPsi", mesh_, - dimensionedScalar("yPsi", sqr(dimLength), 0.0), + dimensionedScalar(sqr(dimLength), 0), y.boundaryFieldRef().types() ) ); diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C index ea2c20efe9..5f92d47a9f 100644 --- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C +++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C @@ -38,20 +38,12 @@ namespace Foam void Foam::wallDist::constructn() const { - n_ = tmp + n_ = volVectorField::New ( - new volVectorField - ( - IOobject - ( - "n" & patchTypeName_, - mesh().time().timeName(), - mesh() - ), - mesh(), - dimensionedVector("n" & patchTypeName_, dimless, Zero), - patchDistMethod::patchTypes(mesh(), patchIDs_) - ) + "n" & patchTypeName_, + mesh(), + dimensionedVector(dimless, Zero), + patchDistMethod::patchTypes(mesh(), patchIDs_) ); const fvPatchList& patches = mesh().boundary(); diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C index 0c95ef6b67..4d47f630aa 100644 --- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C +++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C @@ -129,14 +129,11 @@ Foam::incompressibleTwoPhaseMixture::mu() const min(max(alpha1_, scalar(0)), scalar(1)) ); - return tmp + return volScalarField::New ( - new volScalarField - ( - "mu", - limitedAlpha1*rho1_*nuModel1_->nu() - + (scalar(1) - limitedAlpha1)*rho2_*nuModel2_->nu() - ) + "mu", + limitedAlpha1*rho1_*nuModel1_->nu() + + (scalar(1) - limitedAlpha1)*rho2_*nuModel2_->nu() ); } @@ -149,14 +146,11 @@ Foam::incompressibleTwoPhaseMixture::muf() const min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1)) ); - return tmp + return surfaceScalarField::New ( - new surfaceScalarField - ( - "muf", - alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) - + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) - ) + "muf", + alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) + + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) ); } @@ -169,16 +163,13 @@ Foam::incompressibleTwoPhaseMixture::nuf() const min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1)) ); - return tmp + return surfaceScalarField::New ( - new surfaceScalarField + "nuf", ( - "nuf", - ( - alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) - + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) - )/(alpha1f*rho1_ + (scalar(1) - alpha1f)*rho2_) - ) + alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) + + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) + )/(alpha1f*rho1_ + (scalar(1) - alpha1f)*rho2_) ); } diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C index 41723908fa..154b11e2f0 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C @@ -63,23 +63,7 @@ Foam::surfaceTensionModels::constant::~constant() Foam::tmp Foam::surfaceTensionModels::constant::sigma() const { - return tmp - ( - new volScalarField - ( - IOobject - ( - "sigma", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - sigma_ - ) - ); + return volScalarField::New(sigma_.name(), mesh_, sigma_); } diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C index 9fa69aa715..dd45a5900d 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C @@ -71,20 +71,7 @@ Foam::surfaceTensionModels::temperatureDependent::sigma() const { tmp tsigma ( - new volScalarField - ( - IOobject - ( - "sigma", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimSigma - ) + volScalarField::New("sigma", mesh_, dimSigma) ); volScalarField& sigma = tsigma.ref();