From 819eb066574c6aad75ddcd2fe2c85b1a209285ca Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 21 Dec 2018 07:14:52 +0000 Subject: [PATCH] src: Changed tmp construction to use the new simpler "New" method avoiding unnecessary database registration of temporary fields --- .../DimensionedField/DimensionedField.C | 28 +++++ .../DimensionedField/DimensionedField.H | 9 +- src/combustionModels/EDC/EDC.C | 17 +-- src/combustionModels/FSD/FSD.C | 33 +---- .../consumptionSpeed/consumptionSpeed.C | 11 +- src/combustionModels/PaSR/PaSR.C | 9 +- .../noCombustion/noCombustion.C | 19 +-- .../general/SRF/SRFModel/SRFModel/SRFModel.C | 32 +---- .../field/CourantNo/CourantNo.C | 9 +- .../field/processorField/processorField.C | 9 +- .../field/wallHeatFlux/wallHeatFlux.C | 9 +- .../wallHeatTransferCoeff.C | 9 +- .../field/wallShearStress/wallShearStress.C | 9 +- src/functionObjects/field/yPlus/yPlus.C | 9 +- src/functionObjects/forces/forces/forces.C | 16 +-- .../solvers/scalarTransport/scalarTransport.C | 36 ++---- .../meanVelocityForce/meanVelocityForce.C | 3 +- .../solidificationMeltingSource.C | 26 ++-- .../interRegionHeatTransferModel.C | 13 +- .../coalCloudList/coalCloudListI.H | 55 ++------- .../KinematicCloud/KinematicCloudI.H | 48 ++------ .../Templates/ReactingCloud/ReactingCloudI.H | 48 ++------ .../Templates/ThermoCloud/ThermoCloudI.H | 36 +----- .../MPPIC/PackingModels/Implicit/Implicit.C | 10 +- .../cloudAbsorptionEmission.C | 36 +----- .../scatter/cloudScatter/cloudScatter.C | 12 +- .../kinematicSingleLayer.C | 93 +++----------- .../kinematicSingleLayerI.H | 49 +------- .../surfaceFilmModels/noFilm/noFilm.C | 57 ++------- .../constantFilmThermo/constantFilmThermo.C | 55 ++------- .../liquidFilmThermo/liquidFilmThermo.C | 55 ++------- .../filmTurbulenceModel/laminar/laminar.C | 22 +--- .../contactAngleForce/contactAngleForce.C | 11 +- .../distributionContactAngleForce.C | 9 +- ...bedTemperatureDependentContactAngleForce.C | 9 +- .../temperatureDependentContactAngleForce.C | 9 +- .../curvatureSeparation/curvatureSeparation.C | 4 +- .../constantRadiation/constantRadiation.C | 11 +- .../noRadiation/noRadiation.C | 18 +-- .../primaryRadiation/primaryRadiation.C | 11 +- .../standardRadiation/standardRadiation.C | 11 +- .../constantHeatTransfer.C | 23 +--- .../thermoSingleLayer/thermoSingleLayer.C | 36 +----- .../thermoSingleLayer/thermoSingleLayerI.H | 29 +---- .../thermalBaffleModels/noThermo/noThermo.C | 12 +- .../thermalBaffle/thermalBaffle.C | 12 +- .../basic/heThermo/heThermo.C | 96 +++------------ .../StandardChemistryModel.C | 35 +----- .../laminarFlameSpeed/Gulders/Gulders.C | 24 +--- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 24 +--- .../RaviPetersen/RaviPetersen.C | 12 +- .../laminarFlameSpeed/constant/constant.C | 19 +-- .../radiation/radiationModels/P1/P1.C | 17 +-- .../blackBodyEmission/blackBodyEmission.C | 22 +--- .../radiationModels/fvDOM/fvDOM/fvDOM.C | 22 +--- .../radiationModels/noRadiation/noRadiation.C | 40 ++---- .../radiationModels/opaqueSolid/opaqueSolid.C | 40 ++---- .../radiationModels/viewFactor/viewFactor.C | 42 ++----- .../absorptionEmissionModel.C | 114 ++++-------------- .../constantAbsorptionEmission.C | 63 ++-------- .../greyMeanAbsorptionEmission.C | 22 +--- .../wideBandAbsorptionEmission.C | 22 +--- .../constantScatter/constantScatter.C | 19 +-- .../scatterModel/noScatter/noScatter.C | 19 +-- .../RAS/DLR_A_LTS/constant/reactionsGRI | 69 +++++------ .../RAS/SandiaD_LTS/system/controlDict | 6 +- 66 files changed, 406 insertions(+), 1408 deletions(-) diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C index 6693dcc3d4..49a51f5aa9 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C @@ -336,6 +336,34 @@ DimensionedField::New } +template +Foam::tmp> +DimensionedField::New +( + const word& newName, + const DimensionedField& df +) +{ + return tmp> + ( + new DimensionedField + ( + IOobject + ( + newName, + df.instance(), + df.local(), + df.db(), + IOobject::NO_READ, + IOobject::NO_WRITE, + false + ), + df + ) + ); +} + + template Foam::tmp> DimensionedField::New diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H index dce383950a..a4a1c35eae 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H @@ -254,7 +254,14 @@ public: const dimensioned& ); - //- Rename temporary field and return + //- Return a temporary field constructed from name and a field + static tmp> New + ( + const word& newName, + const DimensionedField& + ); + + //- Return renamed temporary field static tmp> New ( const word& newName, diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C index 9733fc92bc..762a563d13 100644 --- a/src/combustionModels/EDC/EDC.C +++ b/src/combustionModels/EDC/EDC.C @@ -183,21 +183,10 @@ template Foam::tmp Foam::combustionModels::EDC::Qdot() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - this->thermo().phasePropertyName(typeName + ":Qdot"), - this->mesh().time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - kappa_*this->chemistryPtr_->Qdot() - ) + this->thermo().phasePropertyName(typeName + ":Qdot"), + kappa_*this->chemistryPtr_->Qdot() ); } diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C index f841beea6d..36d27a64c4 100644 --- a/src/combustionModels/FSD/FSD.C +++ b/src/combustionModels/FSD/FSD.C @@ -148,16 +148,9 @@ void FSD::calculateSourceNorm() tmp tPc ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->thermo().phasePropertyName("Pc"), - U.time().timeName(), - U.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + this->thermo().phasePropertyName("Pc"), U.mesh(), dimensionedScalar(dimless, 0) ) @@ -167,16 +160,9 @@ void FSD::calculateSourceNorm() tmp tomegaFuel ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->thermo().phasePropertyName("omegaFuelBar"), - U.time().timeName(), - U.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + this->thermo().phasePropertyName("omegaFuelBar"), U.mesh(), dimensionedScalar(omegaFuel.dimensions(), 0) ) @@ -293,16 +279,9 @@ void FSD::calculateSourceNorm() tmp tproducts ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->thermo().phasePropertyName("products"), - U.time().timeName(), - U.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + this->thermo().phasePropertyName("products"), U.mesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C index 877e02d93f..385c90a906 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C @@ -82,16 +82,9 @@ Foam::tmp Foam::consumptionSpeed::omega0Sigma { tmp tomega0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "omega0", - sigma.time().timeName(), - sigma.db(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "omega0", sigma.mesh(), dimensionedScalar ( diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C index b1554ba1ba..cb99373706 100644 --- a/src/combustionModels/PaSR/PaSR.C +++ b/src/combustionModels/PaSR/PaSR.C @@ -109,13 +109,10 @@ template Foam::tmp Foam::combustionModels::PaSR::Qdot() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - this->thermo().phasePropertyName(typeName + ":Qdot"), - kappa_*laminar::Qdot() - ) + this->thermo().phasePropertyName(typeName + ":Qdot"), + kappa_*laminar::Qdot() ); } diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C index af7462e1d8..69dae978e3 100644 --- a/src/combustionModels/noCombustion/noCombustion.C +++ b/src/combustionModels/noCombustion/noCombustion.C @@ -75,22 +75,11 @@ template Foam::tmp Foam::combustionModels::noCombustion::Qdot() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - this->thermo().phasePropertyName(typeName + ":Qdot"), - this->mesh().time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh(), - dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) - ) + this->thermo().phasePropertyName(typeName + ":Qdot"), + this->mesh(), + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); } diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C index 32e09bfdc5..e2561e77dc 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C @@ -121,20 +121,10 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const Foam::tmp> Foam::SRF::SRFModel::Fcoriolis() const { - return tmp + return volVectorField::Internal::New ( - new volVectorField::Internal - ( - IOobject - ( - "Fcoriolis", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - 2.0*omega_ ^ Urel_ - ) + "Fcoriolis", + 2.0*omega_ ^ Urel_ ); } @@ -142,20 +132,10 @@ Foam::SRF::SRFModel::Fcoriolis() const Foam::tmp> Foam::SRF::SRFModel::Fcentrifugal() const { - return tmp + return volVectorField::Internal::New ( - new volVectorField::Internal - ( - IOobject - ( - "Fcentrifugal", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - omega_ ^ (omega_ ^ (mesh_.C() - origin_)) - ) + "Fcentrifugal", + omega_ ^ (omega_ ^ (mesh_.C() - origin_)) ); } diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C index e9990fdd26..8e2202c057 100644 --- a/src/functionObjects/field/CourantNo/CourantNo.C +++ b/src/functionObjects/field/CourantNo/CourantNo.C @@ -75,14 +75,9 @@ bool Foam::functionObjects::CourantNo::calc() tmp tCo ( - new volScalarField + volScalarField::New ( - IOobject - ( - resultName_, - mesh_.time().timeName(), - mesh_ - ), + resultName_, mesh_, dimensionedScalar(dimless, 0), zeroGradientFvPatchScalarField::typeName diff --git a/src/functionObjects/field/processorField/processorField.C b/src/functionObjects/field/processorField/processorField.C index ab7dff7d15..86abf43979 100644 --- a/src/functionObjects/field/processorField/processorField.C +++ b/src/functionObjects/field/processorField/processorField.C @@ -76,14 +76,9 @@ bool Foam::functionObjects::processorField::execute() tmp tprocField ( - new volScalarField + volScalarField::New ( - IOobject - ( - name, - mesh_.time().timeName(), - mesh_ - ), + name, mesh_, dimensionedScalar(name, dimless, Pstream::myProcNo()) ) diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index ccf9d6d84c..5135791c63 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C @@ -67,14 +67,9 @@ Foam::functionObjects::wallHeatFlux::calcWallHeatFlux { tmp twallHeatFlux ( - new volScalarField + volScalarField::New ( - IOobject - ( - type(), - mesh_.time().timeName(), - mesh_ - ), + type(), mesh_, dimensionedScalar(dimMass/pow3(dimTime), 0) ) diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C index 926a80c760..9eede06113 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C @@ -72,14 +72,9 @@ Foam::functionObjects::wallHeatTransferCoeff::calcHeatTransferCoeff { tmp twallHeatTransferCoeff ( - new volScalarField + volScalarField::New ( - IOobject - ( - type(), - mesh_.time().timeName(), - mesh_ - ), + type(), mesh_, dimensionedScalar ( diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index 35bcf403eb..c01e4ffd4b 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -65,14 +65,9 @@ Foam::functionObjects::wallShearStress::calcShearStress { tmp twallShearStress ( - new volVectorField + volVectorField::New ( - IOobject - ( - type(), - mesh_.time().timeName(), - mesh_ - ), + type(), mesh_, dimensionedVector("0", Reff.dimensions(), Zero) ) diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C index cd69557ac8..0fda54e1d8 100644 --- a/src/functionObjects/field/yPlus/yPlus.C +++ b/src/functionObjects/field/yPlus/yPlus.C @@ -69,14 +69,9 @@ Foam::tmp Foam::functionObjects::yPlus::calcYPlus { tmp tyPlus ( - new volScalarField + volScalarField::New ( - IOobject - ( - type(), - mesh_.time().timeName(), - mesh_ - ), + type(), mesh_, dimensionedScalar(dimless, 0) ) diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index 92453fd91f..7b20aeda86 100644 --- a/src/functionObjects/forces/forces/forces.C +++ b/src/functionObjects/forces/forces/forces.C @@ -331,19 +331,11 @@ Foam::tmp Foam::functionObjects::forces::rho() const { if (rhoName_ == "rhoInf") { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "rho", - mesh_.time().timeName(), - mesh_ - ), - mesh_, - dimensionedScalar(dimDensity, rhoRef_) - ) + "rho", + mesh_, + dimensionedScalar(dimDensity, rhoRef_) ); } else diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index c348e0dfb0..214b5998a4 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -65,21 +65,11 @@ Foam::tmp Foam::functionObjects::scalarTransport::D if (constantD_) { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - Dname, - mesh_.time().timeName(), - mesh_.time(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar(Dname, phi.dimensions()/dimLength, D_) - ) + Dname, + mesh_, + dimensionedScalar(Dname, phi.dimensions()/dimLength, D_) ); } else if (mesh_.foundObject(turbulenceModel::propertiesName)) @@ -102,21 +92,11 @@ Foam::tmp Foam::functionObjects::scalarTransport::D } else { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - Dname, - mesh_.time().timeName(), - mesh_.time(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar(Dname, phi.dimensions()/dimLength, 0) - ) + Dname, + mesh_, + dimensionedScalar(Dname, phi.dimensions()/dimLength, 0) ); } } diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C index 40c4789d29..0f39db1e31 100644 --- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C +++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C @@ -244,7 +244,8 @@ void Foam::fv::meanVelocityForce::constrain mesh_.time().timeName(), mesh_, IOobject::NO_READ, - IOobject::NO_WRITE + IOobject::NO_WRITE, + false ), 1.0/eqn.A() ) diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C index ad50c056ef..06dd7fbce9 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C @@ -85,26 +85,16 @@ Foam::fv::solidificationMeltingSource::Cp() const { scalar CpRef = readScalar(coeffs_.lookup("CpRef")); - return tmp + return volScalarField::New ( - new volScalarField + name_ + ":Cp", + mesh_, + dimensionedScalar ( - IOobject - ( - name_ + ":Cp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar - ( - dimEnergy/dimMass/dimTemperature, - CpRef - ), - extrapolatedCalculatedFvPatchScalarField::typeName - ) + dimEnergy/dimMass/dimTemperature, + CpRef + ), + extrapolatedCalculatedFvPatchScalarField::typeName ); } else diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C index d3aaf847c3..b0067f4986 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C @@ -179,18 +179,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup tmp tTmapped ( - new volScalarField - ( - IOobject - ( - type() + ":Tmapped", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - T - ) + volScalarField::New(type() + ":Tmapped", T) ); volScalarField& Tmapped = tTmapped.ref(); diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H index d3e31ac1c5..be1beb70e8 100644 --- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H +++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H @@ -32,16 +32,9 @@ Foam::coalCloudList::UTrans() const { tmp tfld ( - new volVectorField::Internal + volVectorField::Internal::New ( - IOobject - ( - "UTransEff", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "UTransEff", mesh_, dimensionedVector("zero", dimMass*dimVelocity, Zero) ) @@ -80,16 +73,9 @@ Foam::coalCloudList::hsTrans() const { tmp tfld ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "hsTransEff", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "hsTransEff", mesh_, dimensionedScalar(dimEnergy, 0) ) @@ -146,16 +132,9 @@ Foam::coalCloudList::rhoTrans() const { tmp tfld ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "rhoTransEff", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "rhoTransEff", mesh_, dimensionedScalar(dimMass, 0) ) @@ -182,16 +161,9 @@ Foam::coalCloudList::Srho() const { tmp tfld ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "rhoTransEff", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "rhoTransEff", mesh_, dimensionedScalar(dimDensity/dimTime, 0) ) @@ -216,16 +188,9 @@ Foam::coalCloudList::Srho { tmp tfld ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "rhoTransEff", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "rhoTransEff", mesh_, dimensionedScalar(dimDensity/dimTime, 0) ) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 5eb619852f..5628b853e1 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -457,17 +457,9 @@ Foam::KinematicCloud::vDotSweep() const { tmp tvDotSweep ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":vDotSweep", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":vDotSweep", mesh_, dimensionedScalar(dimless/dimTime, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -496,17 +488,9 @@ Foam::KinematicCloud::theta() const { tmp ttheta ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":theta", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":theta", mesh_, dimensionedScalar(dimless, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -535,17 +519,9 @@ Foam::KinematicCloud::alpha() const { tmp talpha ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":alpha", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":alpha", mesh_, dimensionedScalar(dimless, 0) ) @@ -572,17 +548,9 @@ Foam::KinematicCloud::rhoEff() const { tmp trhoEff ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":rhoEff", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":rhoEff", mesh_, dimensionedScalar(dimDensity, 0) ) diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H index 644501f5e7..409eabe206 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H @@ -111,17 +111,9 @@ inline Foam::tmp Foam::ReactingCloud::SYi { tmp trhoTrans ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":rhoTrans", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":rhoTrans", this->mesh(), dimensionedScalar(dimMass/dimTime/dimVolume, 0) ) @@ -159,17 +151,9 @@ Foam::ReactingCloud::Srho(const label i) const { tmp tRhoi ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - this->name() + ":rhoTrans", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":rhoTrans", this->mesh(), dimensionedScalar ( @@ -195,17 +179,9 @@ Foam::ReactingCloud::Srho() const { tmp trhoTrans ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - this->name() + ":rhoTrans", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":rhoTrans", this->mesh(), dimensionedScalar ( @@ -238,17 +214,9 @@ Foam::ReactingCloud::Srho(volScalarField& rho) const { tmp trhoTrans ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":rhoTrans", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":rhoTrans", this->mesh(), dimensionedScalar(dimMass/dimTime/dimVolume, 0) ) diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index a80ac63453..fda4a3beff 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -264,17 +264,9 @@ inline Foam::tmp Foam::ThermoCloud::Ep() const { tmp tEp ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":radiation:Ep", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":radiation:Ep", this->mesh(), dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ) @@ -300,17 +292,9 @@ inline Foam::tmp Foam::ThermoCloud::ap() const { tmp tap ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":radiation:ap", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":radiation:ap", this->mesh(), dimensionedScalar(dimless/dimLength, 0) ) @@ -337,17 +321,9 @@ Foam::ThermoCloud::sigmap() const { tmp tsigmap ( - new volScalarField + volScalarField::New ( - IOobject - ( - this->name() + ":radiation:sigmap", - this->db().time().timeName(), - this->db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + this->name() + ":radiation:sigmap", this->mesh(), dimensionedScalar(dimless/dimLength, 0) ) diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C index 4ea0870e14..78880cd3db 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C @@ -301,14 +301,10 @@ void Foam::PackingModels::Implicit::cacheFields(const bool store) } // correction velocity - uCorrect_ = tmp + uCorrect_ = volVectorField::New ( - new volVectorField - ( - cloudName + ":uCorrect", - fvc::reconstruct(phiCorrect_()) - ) - + cloudName + ":uCorrect", + fvc::reconstruct(phiCorrect_()) ); uCorrect_->correctBoundaryConditions(); diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C index 59d1646395..13965f806e 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C @@ -72,17 +72,9 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const { tmp ta ( - new volScalarField + volScalarField::New ( - IOobject - ( - "a", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "a", mesh_, dimensionedScalar(dimless/dimLength, 0) ) @@ -107,17 +99,9 @@ Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const { tmp te ( - new volScalarField + volScalarField::New ( - IOobject - ( - "e", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "e", mesh_, dimensionedScalar(dimless/dimLength, 0) ) @@ -132,17 +116,9 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const { tmp tE ( - new volScalarField + volScalarField::New ( - IOobject - ( - "E", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "E", mesh_, dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ) diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C index 3668859b05..628872f563 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C @@ -72,17 +72,9 @@ Foam::radiation::cloudScatter::sigmaEff() const { tmp tsigma ( - new volScalarField + volScalarField::New ( - IOobject - ( - "sigma", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "sigma", mesh_, dimensionedScalar(dimless/dimLength, 0) ) diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index 997b1907c5..d918db6b88 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -162,42 +162,22 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields() tmp kinematicSingleLayer::pu() { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - typeName + ":pu", - time_.timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - pPrimary_ // pressure (mapped from primary region) - - pSp_ // accumulated particle impingement - - fvc::laplacian(sigma_, delta_) // surface tension - ) + typeName + ":pu", + pPrimary_ // pressure (mapped from primary region) + - pSp_ // accumulated particle impingement + - fvc::laplacian(sigma_, delta_) // surface tension ); } tmp kinematicSingleLayer::pp() { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - typeName + ":pp", - time_.timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -rho_*gNormClipped() // hydrostatic effect only - ) + typeName + ":pp", + -rho_*gNormClipped() // hydrostatic effect only ); } @@ -1101,22 +1081,11 @@ void kinematicSingleLayer::info() tmp kinematicSingleLayer::Srho() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - typeName + ":Srho", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - primaryMesh(), - dimensionedScalar(dimMass/dimVolume/dimTime, 0) - ) + typeName + ":Srho", + primaryMesh(), + dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); } @@ -1126,44 +1095,22 @@ tmp kinematicSingleLayer::Srho const label i ) const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - typeName + ":Srho(" + Foam::name(i) + ")", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - primaryMesh(), - dimensionedScalar(dimMass/dimVolume/dimTime, 0) - ) + typeName + ":Srho(" + Foam::name(i) + ")", + primaryMesh(), + dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); } tmp kinematicSingleLayer::Sh() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - typeName + ":Sh", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - primaryMesh(), - dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) - ) + typeName + ":Sh", + primaryMesh(), + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); } diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H index 36bb08aa4f..6a0885acbe 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H @@ -208,23 +208,7 @@ inline tmp kinematicSingleLayer::deltaMass() const inline tmp kinematicSingleLayer::gNorm() const { - tmp tgNorm - ( - new volScalarField - ( - IOobject - ( - "gNorm", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - g_ & nHat() - ) - ); - - return tgNorm; + return volScalarField::New("gNorm", g_ & nHat()); } @@ -232,18 +216,7 @@ inline tmp kinematicSingleLayer::gNormClipped() const { tmp tgNormClipped ( - new volScalarField - ( - IOobject - ( - "gNormClipped", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - g_ & nHat() - ) + volScalarField::New("gNormClipped", g_ & nHat()) ); volScalarField& gNormClipped = tgNormClipped.ref(); @@ -255,23 +228,7 @@ inline tmp kinematicSingleLayer::gNormClipped() const inline tmp kinematicSingleLayer::gTan() const { - tmp tgTan - ( - new volVectorField - ( - IOobject - ( - "gTan", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - g_ - nHat()*gNorm() - ) - ); - - return tgTan; + return volVectorField::New("gTan", g_ - nHat()*gNorm()); } diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C index f1d4ab524e..442d31251f 100644 --- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C +++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C @@ -72,66 +72,33 @@ Foam::scalar noFilm::CourantNumber() const tmp noFilm::Srho() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "noFilm::Srho", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimMass/dimVolume/dimTime, 0) - ) + "noFilm::Srho", + mesh_, + dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); } tmp noFilm::Srho(const label i) const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "noFilm::Srho(" + Foam::name(i) + ")", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimMass/dimVolume/dimTime, 0) - ) + "noFilm::Srho(" + Foam::name(i) + ")", + mesh_, + dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); } tmp noFilm::Sh() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "noFilm::Sh", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) - ) + "noFilm::Sh", + mesh_, + dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C index 7eb612fd71..0b4d0580d7 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C @@ -261,16 +261,9 @@ tmp constantFilmThermo::rho() const { tmp trho ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ':' + rho0_.name_, - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ':' + rho0_.name_, film().regionMesh(), dimensionedScalar(dimDensity, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -288,16 +281,9 @@ tmp constantFilmThermo::mu() const { tmp tmu ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ':' + mu0_.name_, - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ':' + mu0_.name_, film().regionMesh(), dimensionedScalar(dimPressure*dimTime, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -315,16 +301,9 @@ tmp constantFilmThermo::sigma() const { tmp tsigma ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ':' + sigma0_.name_, - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ':' + sigma0_.name_, film().regionMesh(), dimensionedScalar(dimMass/sqr(dimTime), 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -342,16 +321,9 @@ tmp constantFilmThermo::Cp() const { tmp tCp ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ':' + Cp0_.name_, - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ':' + Cp0_.name_, film().regionMesh(), dimensionedScalar(dimEnergy/dimMass/dimTemperature, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -369,16 +341,9 @@ tmp constantFilmThermo::kappa() const { tmp tkappa ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ':' + kappa0_.name_, - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ':' + kappa0_.name_, film().regionMesh(), dimensionedScalar(dimPower/dimLength/dimTemperature, 0), extrapolatedCalculatedFvPatchScalarField::typeName diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C index 25ed8c885c..032869d412 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C @@ -240,16 +240,9 @@ tmp liquidFilmThermo::rho() const { tmp trho ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ":rho", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ":rho", film().regionMesh(), dimensionedScalar(dimDensity, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -288,16 +281,9 @@ tmp liquidFilmThermo::mu() const { tmp tmu ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ":mu", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ":mu", film().regionMesh(), dimensionedScalar(dimPressure*dimTime, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -336,16 +322,9 @@ tmp liquidFilmThermo::sigma() const { tmp tsigma ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ":sigma", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ":sigma", film().regionMesh(), dimensionedScalar(dimMass/sqr(dimTime), 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -384,16 +363,9 @@ tmp liquidFilmThermo::Cp() const { tmp tCp ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ":Cp", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ":Cp", film().regionMesh(), dimensionedScalar(dimEnergy/dimMass/dimTemperature, 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -432,16 +404,9 @@ tmp liquidFilmThermo::kappa() const { tmp tkappa ( - new volScalarField + volScalarField::New ( - IOobject - ( - type() + ":kappa", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + type() + ":kappa", film().regionMesh(), dimensionedScalar(dimPower/dimLength/dimTemperature, 0), extrapolatedCalculatedFvPatchScalarField::typeName diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C index 9ca86f2751..437b866d83 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C @@ -72,16 +72,9 @@ tmp laminar::Us() const { tmp tUs ( - new volVectorField + volVectorField::New ( - IOobject - ( - typeName + ":Us", - filmModel_.regionMesh().time().timeName(), - filmModel_.regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":Us", filmModel_.regionMesh(), dimensionedVector("zero", dimVelocity, Zero), extrapolatedCalculatedFvPatchVectorField::typeName @@ -100,16 +93,9 @@ tmp laminar::mut() const { return tmp ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":mut", - filmModel_.regionMesh().time().timeName(), - filmModel_.regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":mut", filmModel_.regionMesh(), dimensionedScalar(dimMass/dimLength/dimTime, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C index e8174c2879..98bed65ce1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C @@ -131,16 +131,9 @@ tmp contactAngleForce::correct(volVectorField& U) { tmp tForce ( - new volVectorField + volVectorField::New ( - IOobject - ( - typeName + ":contactForce", - filmModel_.time().timeName(), - filmModel_.regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":contactForce", filmModel_.regionMesh(), dimensionedVector("zero", dimForce/dimArea, Zero) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C index 2667fb0264..87ca9a2d4f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C @@ -74,14 +74,9 @@ tmp distributionContactAngleForce::theta() const { tmp ttheta ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":theta", - filmModel_.time().timeName(), - filmModel_.regionMesh() - ), + typeName + ":theta", filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C index e6851d3973..c8405a3887 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C @@ -83,14 +83,9 @@ perturbedTemperatureDependentContactAngleForce::theta() const { tmp ttheta ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":theta", - filmModel_.time().timeName(), - filmModel_.regionMesh() - ), + typeName + ":theta", filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C index 8c1831ff1f..850ff6d505 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C @@ -71,14 +71,9 @@ tmp temperatureDependentContactAngleForce::theta() const { tmp ttheta ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":theta", - filmModel_.time().timeName(), - filmModel_.regionMesh() - ), + typeName + ":theta", filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C index 5b303c8c98..c6ad4fc5ed 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C @@ -65,7 +65,7 @@ tmp curvatureSeparation::calcInvR1 /* tmp tinvR1 ( - new volScalarField("invR1", fvc::div(film().nHat())) + volScalarField::New("invR1", fvc::div(film().nHat())) ); */ @@ -74,7 +74,7 @@ tmp curvatureSeparation::calcInvR1 volVectorField UHat(U/(mag(U) + smallU)); tmp tinvR1 ( - new volScalarField("invR1", UHat & (UHat & gradNHat_)) + volScalarField::New("invR1", UHat & (UHat & gradNHat_)) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index 3adcd0ceb4..93e04b65d9 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -105,16 +105,9 @@ tmp constantRadiation::Shs() { tmp tShs ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":Shs", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":Shs", film().regionMesh(), dimensionedScalar(dimMass/pow3(dimTime), 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C index e5bb0ef436..6cd7770888 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C @@ -73,21 +73,11 @@ void noRadiation::correct() tmp noRadiation::Shs() { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - typeName + ":Shs", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - film().regionMesh(), - dimensionedScalar(dimMass/pow3(dimTime), 0) - ) + typeName + ":Shs", + film().regionMesh(), + dimensionedScalar(dimMass/pow3(dimTime), 0) ); } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index aec7cc7e71..648f12b14f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C @@ -92,16 +92,9 @@ tmp primaryRadiation::Shs() { tmp tShs ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":Shs", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":Shs", film().regionMesh(), dimensionedScalar(dimMass/pow3(dimTime), 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index 574a6ae886..218f543961 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C @@ -109,16 +109,9 @@ tmp standardRadiation::Shs() { tmp tShs ( - new volScalarField + volScalarField::New ( - IOobject - ( - typeName + ":Shs", - film().time().timeName(), - film().regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + typeName + ":Shs", film().regionMesh(), dimensionedScalar(dimMass/pow3(dimTime), 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C index 2ec9156954..12a227750b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C @@ -74,25 +74,14 @@ void constantHeatTransfer::correct() tmp constantHeatTransfer::h() const { - return tmp + return volScalarField::New ( - new volScalarField + "htc", + filmModel_.regionMesh(), + dimensionedScalar ( - IOobject - ( - "htc", - filmModel_.time().timeName(), - filmModel_.regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - filmModel_.regionMesh(), - dimensionedScalar - ( - dimEnergy/dimTime/sqr(dimLength)/dimTemperature, - c0_ - ) + dimEnergy/dimTime/sqr(dimLength)/dimTemperature, + c0_ ) ); } diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C index c734ec10ba..c036c67afd 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C @@ -726,17 +726,9 @@ tmp thermoSingleLayer::Srho() const { tmp tSrho ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "thermoSingleLayer::Srho", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "thermoSingleLayer::Srho", primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) @@ -778,17 +770,9 @@ tmp thermoSingleLayer::Srho tmp tSrho ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "thermoSingleLayer::Srho(" + Foam::name(i) + ")", - time_.timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "thermoSingleLayer::Srho(" + Foam::name(i) + ")", primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) @@ -828,17 +812,9 @@ tmp thermoSingleLayer::Sh() const { tmp tSh ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "thermoSingleLayer::Sh", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "thermoSingleLayer::Sh", primaryMesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ) diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H index ab4706c116..88626bda83 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H @@ -61,20 +61,10 @@ inline tmp thermoSingleLayer::hs const volScalarField& T ) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "hs(" + T.name() + ")", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - Cp_*(T - Tref) - ) + "hs(" + T.name() + ")", + Cp_*(T - Tref) ); } @@ -86,18 +76,7 @@ inline tmp thermoSingleLayer::T { tmp tT ( - new volScalarField - ( - IOobject - ( - "T(" + hs.name() + ")", - time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), - hs/Cp_ + Tref - ) + volScalarField::New("T(" + hs.name() + ")", hs/Cp_ + Tref) ); tT.ref().min(Tmax_); diff --git a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C index 57d24350a3..6897cf1917 100644 --- a/src/regionModels/thermalBaffleModels/noThermo/noThermo.C +++ b/src/regionModels/thermalBaffleModels/noThermo/noThermo.C @@ -93,17 +93,9 @@ const tmp noThermo::Cp() const return tmp ( - new volScalarField + volScalarField::New ( - IOobject - ( - "noThermo::Cp", - time().timeName(), - primaryMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "noThermo::Cp", primaryMesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ) diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C index 0d5f134616..1841aefefd 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C +++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C @@ -75,17 +75,9 @@ void thermalBaffle::solveEnergy() tmp tQ ( - new volScalarField + volScalarField::New ( - IOobject - ( - "tQ", - regionMesh().time().timeName(), - regionMesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "tQ", regionMesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ) diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C index 48641717f8..e13f5690c2 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/heThermo/heThermo.C @@ -170,17 +170,9 @@ Foam::tmp Foam::heThermo::he tmp the ( - new volScalarField + volScalarField::New ( - IOobject - ( - "he", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "he", mesh, he_.dimensions() ) @@ -265,17 +257,9 @@ Foam::heThermo::hc() const tmp thc ( - new volScalarField + volScalarField::New ( - IOobject - ( - "hc", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "hc", mesh, he_.dimensions() ) @@ -334,17 +318,9 @@ Foam::heThermo::Cp() const tmp tCp ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Cp", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Cp", mesh, dimEnergy/dimMass/dimTemperature ) @@ -407,17 +383,9 @@ Foam::heThermo::Cv() const tmp tCv ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Cv", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Cv", mesh, dimEnergy/dimMass/dimTemperature ) @@ -476,17 +444,9 @@ Foam::heThermo::gamma() const tmp tgamma ( - new volScalarField + volScalarField::New ( - IOobject - ( - "gamma", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "gamma", mesh, dimless ) @@ -551,17 +511,9 @@ Foam::heThermo::Cpv() const tmp tCpv ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Cpv", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Cpv", mesh, dimEnergy/dimMass/dimTemperature ) @@ -623,17 +575,9 @@ Foam::heThermo::CpByCpv() const tmp tCpByCpv ( - new volScalarField + volScalarField::New ( - IOobject - ( - "CpByCpv", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "CpByCpv", mesh, dimless ) @@ -729,17 +673,9 @@ Foam::tmp Foam::heThermo::W tmp tW ( - new volScalarField + volScalarField::New ( - IOobject - ( - "W", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "W", mesh, dimMass/dimMoles ) diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C index 1e9c919782..51f0b94706 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C @@ -276,17 +276,9 @@ Foam::StandardChemistryModel::tc() const { tmp ttc ( - new volScalarField + volScalarField::New ( - IOobject - ( - "tc", - this->time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "tc", this->mesh(), dimensionedScalar(dimTime, small), extrapolatedCalculatedFvPatchScalarField::typeName @@ -350,17 +342,9 @@ Foam::StandardChemistryModel::Qdot() const { tmp tQdot ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Qdot", - this->mesh_.time().timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Qdot", this->mesh_, dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ) @@ -394,16 +378,9 @@ Foam::StandardChemistryModel::calculateRR { tmp tRR ( - new volScalarField::Internal + volScalarField::Internal::New ( - IOobject - ( - "RR", - this->mesh().time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "RR", this->mesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C index 4e5aa82fcc..d3a6e75733 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C +++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C @@ -112,17 +112,9 @@ Foam::tmp Foam::laminarFlameSpeedModels::Gulders::Su0pTphi { tmp tSu0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Su0", - p.time().timeName(), - p.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Su0", p.mesh(), dimensionedScalar(dimVelocity, 0) ) @@ -165,17 +157,9 @@ Foam::tmp Foam::laminarFlameSpeedModels::Gulders::Su0pTphi { tmp tSu0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Su0", - p.time().timeName(), - p.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Su0", p.mesh(), dimensionedScalar(dimVelocity, 0) ) diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C index e5d476840b..55eda9e313 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C +++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C @@ -112,17 +112,9 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi { tmp tSu0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Su0", - p.time().timeName(), - p.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Su0", p.mesh(), dimensionedScalar(dimVelocity, 0) ) @@ -167,17 +159,9 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi { tmp tSu0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Su0", - p.time().timeName(), - p.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Su0", p.mesh(), dimensionedScalar(dimVelocity, 0) ) diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C index ed1f00c470..cc246a3342 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C +++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C @@ -327,17 +327,9 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const tmp tSu0 ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Su0", - p.time().timeName(), - p.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), + "Su0", p.mesh(), dimensionedScalar(dimVelocity, 0) ) diff --git a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C index 9c1129af8f..5c81d2697b 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C +++ b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C @@ -69,22 +69,11 @@ Foam::laminarFlameSpeedModels::constant::~constant() Foam::tmp Foam::laminarFlameSpeedModels::constant::operator()() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "Su0", - psiuReactionThermo_.T().time().timeName(), - psiuReactionThermo_.T().db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - psiuReactionThermo_.T().mesh(), - Su_ - ) + "Su0", + psiuReactionThermo_.T().mesh(), + Su_ ); } diff --git a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C index 6595c9a494..959756519e 100644 --- a/src/thermophysicalModels/radiation/radiationModels/P1/P1.C +++ b/src/thermophysicalModels/radiation/radiationModels/P1/P1.C @@ -259,21 +259,10 @@ void Foam::radiation::P1::calculate() Foam::tmp Foam::radiation::P1::Rp() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "Rp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - 4.0*absorptionEmission_->eCont()*physicoChemical::sigma - ) + "Rp", + 4.0*absorptionEmission_->eCont()*physicoChemical::sigma ); } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C index 45e628376b..b0e3419a2d 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C @@ -206,16 +206,9 @@ Foam::radiation::blackBodyEmission::deltaLambdaT { tmp deltaLambdaT ( - new volScalarField + volScalarField::New ( - IOobject - ( - "deltaLambdaT", - T.mesh().time().timeName(), - T.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "deltaLambdaT", T.mesh(), dimensionedScalar(dimless, 1.0) ) @@ -244,16 +237,9 @@ Foam::radiation::blackBodyEmission::EbDeltaLambdaT { tmp Eb ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Eb", - T.mesh().time().timeName(), - T.mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "Eb", physicoChemical::sigma*pow4(T) ) ); diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C index a7cf3c4d66..d33581a4a7 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C @@ -448,23 +448,13 @@ Foam::tmp Foam::radiation::fvDOM::Rp() const // Construct using contribution from first frequency band tmp tRp ( - new volScalarField + volScalarField::New ( - IOobject - ( - "Rp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - ( - 4 - *physicoChemical::sigma - *(aLambda_[0] - absorptionEmission_->aDisp(0)()) - *blackBody_.deltaLambdaT(T_, absorptionEmission_->bands(0)) - ) + "Rp", + 4 + *physicoChemical::sigma + *(aLambda_[0] - absorptionEmission_->aDisp(0)()) + *blackBody_.deltaLambdaT(T_, absorptionEmission_->bands(0)) ) ); diff --git a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C index 0f240e5089..4b573add1b 100644 --- a/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C +++ b/src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C @@ -84,24 +84,14 @@ bool Foam::radiation::noRadiation::read() Foam::tmp Foam::radiation::noRadiation::Rp() const { - return tmp + return volScalarField::New ( - new volScalarField + "Rp", + mesh_, + dimensionedScalar ( - IOobject - ( - "Rp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar - ( - constant::physicoChemical::sigma.dimensions()/dimLength, - 0 - ) + constant::physicoChemical::sigma.dimensions()/dimLength, + 0 ) ); } @@ -110,21 +100,11 @@ Foam::tmp Foam::radiation::noRadiation::Rp() const Foam::tmp> Foam::radiation::noRadiation::Ru() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "Ru", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) - ) + "Ru", + mesh_, + dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ); } diff --git a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C index 97da7ba0eb..c1c6fff460 100644 --- a/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C +++ b/src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C @@ -81,24 +81,14 @@ void Foam::radiation::opaqueSolid::calculate() Foam::tmp Foam::radiation::opaqueSolid::Rp() const { - return tmp + return volScalarField::New ( - new volScalarField + "Rp", + mesh_, + dimensionedScalar ( - IOobject - ( - "Rp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar - ( - constant::physicoChemical::sigma.dimensions()/dimLength, - 0 - ) + constant::physicoChemical::sigma.dimensions()/dimLength, + 0 ) ); } @@ -107,21 +97,11 @@ Foam::tmp Foam::radiation::opaqueSolid::Rp() const Foam::tmp> Foam::radiation::opaqueSolid::Ru() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "Ru", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh_, - dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) - ) + "Ru", + mesh_, + dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ); } diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C index 912552347f..90700ffdfd 100644 --- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C +++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C @@ -677,25 +677,14 @@ void Foam::radiation::viewFactor::calculate() Foam::tmp Foam::radiation::viewFactor::Rp() const { - return tmp + return volScalarField::New ( - new volScalarField + "Rp", + mesh_, + dimensionedScalar ( - IOobject - ( - "Rp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar - ( - dimMass/pow3(dimTime)/dimLength/pow4(dimTemperature), - 0 - ) + dimMass/pow3(dimTime)/dimLength/pow4(dimTemperature), + 0 ) ); } @@ -704,22 +693,11 @@ Foam::tmp Foam::radiation::viewFactor::Rp() const Foam::tmp> Foam::radiation::viewFactor::Ru() const { - return tmp + return volScalarField::Internal::New ( - new volScalarField::Internal - ( - IOobject - ( - "Ru", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) - ) + "Ru", + mesh_, + dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ); } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C index 05b70adf36..11d122d671 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C @@ -67,22 +67,11 @@ Foam::radiation::absorptionEmissionModel::a(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "aCont", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimless/dimLength, 0) - ) + "aCont", + mesh_, + dimensionedScalar(dimless/dimLength, 0) ); } @@ -90,22 +79,11 @@ Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::aDisp(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "aDisp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimless/dimLength, 0) - ) + "aDisp", + mesh_, + dimensionedScalar(dimless/dimLength, 0) ); } @@ -120,22 +98,11 @@ Foam::radiation::absorptionEmissionModel::e(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "eCont", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimless/dimLength, 0) - ) + "eCont", + mesh_, + dimensionedScalar(dimless/dimLength, 0) ); } @@ -143,22 +110,11 @@ Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::eDisp(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "eDisp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimless/dimLength, 0) - ) + "eDisp", + mesh_, + dimensionedScalar(dimless/dimLength, 0) ); } @@ -173,22 +129,11 @@ Foam::radiation::absorptionEmissionModel::E(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "ECont", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) - ) + "ECont", + mesh_, + dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ); } @@ -196,22 +141,11 @@ Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const Foam::tmp Foam::radiation::absorptionEmissionModel::EDisp(const label bandI) const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "EDisp", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) - ) + "EDisp", + mesh_, + dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ); } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C index 2938f25f2b..ad6f1e6a65 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C @@ -71,75 +71,36 @@ Foam::radiation::constantAbsorptionEmission::~constantAbsorptionEmission() Foam::tmp Foam::radiation::constantAbsorptionEmission::aCont(const label bandI) const { - tmp ta + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "a", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - a_ - ) + "a", + mesh_, + a_ ); - - return ta; } Foam::tmp Foam::radiation::constantAbsorptionEmission::eCont(const label bandI) const { - tmp te + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "e", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - e_ - ) + "e", + mesh_, + e_ ); - - return te; } Foam::tmp Foam::radiation::constantAbsorptionEmission::ECont(const label bandI) const { - tmp tE + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "E", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - E_ - ) + "E", + mesh_, + E_ ); - - return tE; } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C index d7958b84fc..389fd2179b 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C @@ -186,16 +186,9 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const tmp ta ( - new volScalarField + volScalarField::New ( - IOobject - ( - "aCont" + name(bandI), - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "aCont" + name(bandI), mesh(), dimensionedScalar(dimless/dimLength, 0), extrapolatedCalculatedFvPatchVectorField::typeName @@ -267,16 +260,9 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const { tmp E ( - new volScalarField + volScalarField::New ( - IOobject - ( - "ECont" + name(bandI), - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "ECont" + name(bandI), mesh_, dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ) diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C index bb4f37b9fc..dc9783fae4 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C @@ -201,16 +201,9 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandi) const tmp ta ( - new volScalarField + volScalarField::New ( - IOobject - ( - "a", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "a", mesh(), dimensionedScalar(dimless/dimLength, 0) ) @@ -285,16 +278,9 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandi) const { tmp E ( - new volScalarField + volScalarField::New ( - IOobject - ( - "E", - mesh().time().timeName(), - mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "E", mesh(), dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0) ) diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C index 29e29e41ca..df39ffbbd0 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C @@ -70,22 +70,11 @@ Foam::radiation::constantScatter::~constantScatter() Foam::tmp Foam::radiation::constantScatter::sigmaEff() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "sigma", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - sigma_*(3.0 - C_) - ) + "sigma", + mesh_, + sigma_*(3.0 - C_) ); } diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C index dc8b9bfde7..f096a6121c 100644 --- a/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C +++ b/src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C @@ -60,22 +60,11 @@ Foam::radiation::noScatter::~noScatter() Foam::tmp Foam::radiation::noScatter::sigmaEff() const { - return tmp + return volScalarField::New ( - new volScalarField - ( - IOobject - ( - "sigma", - mesh_.time().timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh_, - dimensionedScalar(dimless/dimLength, 0) - ) + "sigma", + mesh_, + dimensionedScalar(dimless/dimLength, 0) ); } diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI index 9e89ab5d95..57825a2f0a 100644 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI @@ -1,4 +1,4 @@ -elements +elements 5 ( O @@ -9,7 +9,7 @@ Ar ) ; -species +species 36 ( H2 @@ -60,7 +60,7 @@ reactions A 1.2e+11; beta -1; Ta 0; - coeffs + coeffs 36 ( (H2 2.4) @@ -109,7 +109,7 @@ reactions A 5e+11; beta -1; Ta 0; - coeffs + coeffs 36 ( (H2 2) @@ -244,7 +244,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -454,7 +454,7 @@ reactions A 2.8e+12; beta -0.86; Ta 0; - coeffs + coeffs 36 ( (H2 1) @@ -543,7 +543,7 @@ reactions A 1e+12; beta -1; Ta 0; - coeffs + coeffs 36 ( (H2 0) @@ -616,7 +616,7 @@ reactions A 2.2e+16; beta -2; Ta 0; - coeffs + coeffs 36 ( (H2 0.73) @@ -731,7 +731,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -807,7 +807,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -883,7 +883,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -959,7 +959,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1027,7 +1027,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1103,7 +1103,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1195,7 +1195,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1311,7 +1311,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1379,7 +1379,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1447,7 +1447,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1523,7 +1523,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1599,7 +1599,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1715,7 +1715,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1791,7 +1791,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -1931,7 +1931,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -2279,7 +2279,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -2411,7 +2411,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -2527,7 +2527,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -2675,7 +2675,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -2789,7 +2789,7 @@ reactions A 1.87e+14; beta -1; Ta 8554.25106; - coeffs + coeffs 36 ( (H2 2) @@ -2904,7 +2904,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3036,7 +3036,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3216,7 +3216,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3340,7 +3340,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3448,7 +3448,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3524,7 +3524,7 @@ reactions } thirdBodyEfficiencies { - coeffs + coeffs 36 ( (H2 2) @@ -3611,3 +3611,4 @@ reactions Tlow 250; Thigh 5000; + diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict index 3258603c1d..3589b85eea 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict @@ -18,17 +18,17 @@ application reactingFoam; startFrom startTime; -startTime 1500; +startTime 0; stopAt endTime; -endTime 5000; +endTime 1500; deltaT 1; writeControl runTime; -writeInterval 100; +writeInterval 1500; purgeWrite 0;