zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: use tmp field factory methods [11] (#2723)

Browse Source 
- src/optimisation
This commit is contained in:
Mark Olesen
2024-01-23 10:55:56 +01:00
parent c138f89c1f
commit ec2b1be8c5
20 changed files with 137 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCModel/ATCModel.C
View File

@ -229,25 +229,16 @@ tmp<volScalarField> ATCModel::createLimiter
const labelList& zeroCells = zeroType->getZeroATCcells();
const label nSmooth = dict.getOrDefault<label>("nSmooth", 0);
tmp<volScalarField> tlimiter
(
new volScalarField
(
IOobject
auto tlimiter = volScalarField::New
(
"limiter",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh,
scalar(1),
dimless,
fvPatchFieldBase::zeroGradientType()
)
);
volScalarField& limiter = tlimiter.ref();
auto& limiter = tlimiter.ref();
computeLimiter(limiter, zeroCells, nSmooth);

15
src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.C
View File

@ -102,23 +102,14 @@ void ATCUaGradU::addATC(fvVectorMatrix& UaEqn)
tmp<volTensorField> ATCUaGradU::getFISensitivityTerm() const
{
tmp<volTensorField> tvolSDTerm
(
new volTensorField
(
IOobject
auto tvolSDTerm = volTensorField::New
(
"ATCFISensitivityTerm" + type(),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedTensor(sqr(dimLength)/pow(dimTime, 3), Zero)
)
);
volTensorField& volSDTerm = tvolSDTerm.ref();
auto& volSDTerm = tvolSDTerm.ref();
const volVectorField& U = primalVars_.U();
const volVectorField& Ua = adjointVars_.Ua();

9
src/optimisation/adjointOptimisation/adjoint/boundaryAdjointContributions/boundaryAdjointContributionIncompressible/boundaryAdjointContributionIncompressible.C
View File

@ -251,8 +251,8 @@ tmp<scalarField> boundaryAdjointContributionIncompressible::momentumDiffusion()
tmp<scalarField> boundaryAdjointContributionIncompressible::laminarDiffusivity()
{
tmp<scalarField> tnu(new scalarField(patch_.size(), Zero));
scalarField& nu = tnu.ref();
auto tnu = tmp<scalarField>::New(patch_.size(), Zero);
auto& nu = tnu.ref();
const autoPtr<incompressible::turbulenceModel>& turbulenceModel =
primalVars_.turbulence();
@ -272,13 +272,10 @@ tmp<scalarField> boundaryAdjointContributionIncompressible::thermalDiffusion()
tmp<scalarField> talphaEff = turbulenceModel.alphaEff(patch_.index());
*/
tmp<scalarField> talphaEff(new scalarField(patch_.size(), Zero));
WarningInFunction
<< "no abstract thermalDiffusion is implemented. Returning zero field";
return talphaEff;
return tmp<scalarField>::New(patch_.size(), Zero);
}

4
src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
View File

@ -171,9 +171,7 @@ Foam::elasticityMotionSolver::elasticityMotionSolver
Foam::tmp<Foam::pointField> Foam::elasticityMotionSolver::curPoints() const
{
tmp<pointField> tnewPoints(new pointField(mesh().points()));
return tnewPoints;
return tmp<pointField>::New(mesh().points());
}

4
src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/volumetricBSplinesMotionSolver/volumetricBSplinesMotionSolver.C
View File

@ -74,8 +74,8 @@ Foam::volumetricBSplinesMotionSolver::volumetricBSplinesMotionSolver
Foam::tmp<Foam::pointField>
Foam::volumetricBSplinesMotionSolver::curPoints() const
{
tmp<vectorField> tPointMovement(new vectorField(mesh().points()));
vectorField& pointMovement = tPointMovement.ref();
auto tPointMovement = tmp<vectorField>::New(mesh().points());
auto& pointMovement = tPointMovement.ref();
label pastControlPoints(0);
PtrList<NURBS3DVolume>& boxes = volBSplinesBase_.boxesRef();

17
src/optimisation/adjointOptimisation/adjoint/interpolation/volPointInterpolation/volPointInterpolateAdjoint.C
View File

@ -81,7 +81,8 @@ void Foam::volPointInterpolationAdjoint::pushUntransformedData
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolationAdjoint::flatBoundaryField
Foam::tmp<Foam::Field<Type>>
Foam::volPointInterpolationAdjoint::flatBoundaryField
(
const GeometricField<Type, fvPatchField, volMesh>& vf
) const
@ -89,11 +90,8 @@ Foam::tmp<Foam::Field<Type>> Foam::volPointInterpolationAdjoint::flatBoundaryFie
const fvMesh& mesh = vf.mesh();
const fvBoundaryMesh& bm = mesh.boundary();
tmp<Field<Type>> tboundaryVals
(
new Field<Type>(mesh.nBoundaryFaces())
);
Field<Type>& boundaryVals = tboundaryVals.ref();
auto tboundaryVals = tmp<Field<Type>>::New(mesh.nBoundaryFaces());
auto& boundaryVals = tboundaryVals.ref();
forAll(vf.boundaryField(), patchi)
{
@ -188,11 +186,8 @@ void Foam::volPointInterpolationAdjoint::interpolateSensitivitiesField
const fvMesh& Mesh = mesh();
const fvBoundaryMesh& bm = Mesh.boundary();
tmp<Field<Type>> tboundaryVals
(
new Field<Type>(Mesh.nBoundaryFaces(), Zero)
);
Field<Type>& boundaryVals = tboundaryVals.ref();
auto tboundaryVals = tmp<Field<Type>>::New(Mesh.nBoundaryFaces(), Zero);
auto& boundaryVals = tboundaryVals.ref();
// Do points on 'normal' patches from the surrounding patch faces
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariables.C
View File

@ -262,7 +262,7 @@ void Foam::designVariables::addFvOptions
Foam::tmp<Foam::scalarField> Foam::designVariables::constraintValues()
{
return tmp<scalarField>(nullptr);
return nullptr;
}

7
src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C
View File

@ -267,12 +267,7 @@ Foam::tmp<Foam::scalarField> Foam::updateMethod::readOrZeroField
const label size
)
{
return tmp<scalarField>
(
found(name) ?
new scalarField(name, *this, size) :
new scalarField(size, Zero)
);
return tmp<scalarField>::New(name, *this, size, IOobjectOption::LAZY_READ);
}

26
src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
View File

@ -1342,8 +1342,9 @@ Foam::tmp<Foam::tensorField> Foam::NURBS3DVolume::dndbBasedSensitivities
const fvPatch& patch = mesh_.boundary()[patchI];
const polyPatch& ppatch = patch.patch();
// Return field
tmp<tensorField> tdndbSens(new tensorField(patch.size(), Zero));
tensorField& dndbSens = tdndbSens.ref();
auto tdndbSens = tmp<tensorField>::New(patch.size(), Zero);
auto& dndbSens = tdndbSens.ref();
// Auxiliary quantities
deltaBoundary deltaBoundary(mesh_);
const label patchStart = ppatch.start();
@ -1574,8 +1575,8 @@ Foam::tmp<Foam::vectorField> Foam::NURBS3DVolume::computeNewPoints
const vectorField& parameterizedPoints = tparameterizedPoints();
// Return field. Initialized with current mesh points
tmp<vectorField> tnewPoints(new vectorField(mesh_.points()));
vectorField& newPoints = tnewPoints.ref();
auto tnewPoints = tmp<vectorField>::New(mesh_.points());
auto& newPoints = tnewPoints.ref();
// Update position of parameterized points
forAll(parameterizedPoints, pI)
@ -1612,8 +1613,8 @@ Foam::tmp<Foam::vectorField> Foam::NURBS3DVolume::computeNewBoundaryPoints
}
// Return field. Initialized with current mesh points
tmp<vectorField> tnewPoints(new vectorField(mesh_.points()));
vectorField& newPoints = tnewPoints.ref();
auto tnewPoints = tmp<vectorField>::New(mesh_.points());
auto& newPoints = tnewPoints.ref();
// Update position of parameterized boundary points
for (const label patchI : patchesToBeMoved)
@ -1883,21 +1884,12 @@ Foam::tmp<Foam::volTensorField> Foam::NURBS3DVolume::getDxCellsDb
const vectorField& parametricCoordinates = getParametricCoordinates();
// Set return field to zero
tmp<volTensorField> tDxDb
(
new volTensorField
(
IOobject
auto tDxDb = volTensorField::New
(
"DxDb",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedTensor(dimless, Zero)
)
);
volTensorField& DxDb = tDxDb.ref();

4
src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolverManager/adjointSolverManager.C
View File

@ -301,8 +301,8 @@ void Foam::adjointSolverManager::solveAdjointEquations()
Foam::tmp<Foam::scalarField>
Foam::adjointSolverManager::aggregateSensitivities()
{
tmp<scalarField> tsens(new scalarField(0));
scalarField& sens = tsens.ref();
auto tsens = tmp<scalarField>::New();
auto& sens = tsens.ref();
// Sum sensitivities from all objectives expect the constraints
for (const label solveri : objectiveSolverIDs_)

9
src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressible/incompressibleVars.C
View File

@ -131,7 +131,8 @@ void incompressibleVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
pInst()
)
@ -146,7 +147,8 @@ void incompressibleVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
UInst()
)
@ -161,7 +163,8 @@ void incompressibleVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
phiInst()
)

9
src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/incompressibleAdjointMeanFlow/incompressibleAdjointMeanFlowVars.C
View File

@ -76,7 +76,8 @@ void incompressibleAdjointMeanFlowVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
paInst()
)
@ -91,7 +92,8 @@ void incompressibleAdjointMeanFlowVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
UaInst()
)
@ -106,7 +108,8 @@ void incompressibleAdjointMeanFlowVars::setMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
phiaInst()
)

49
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointLaminar/adjointLaminar.C
View File

@ -80,18 +80,11 @@ tmp<volSymmTensorField> adjointLaminar::devReff
const volVectorField& U
) const
{
return tmp<volSymmTensorField>
(
new volSymmTensorField
(
IOobject
return volSymmTensorField::New
(
"devRhoReff",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
(
-nu()*devTwoSymm(fvc::grad(U))
)
);
@ -110,22 +103,12 @@ tmp<fvVectorMatrix> adjointLaminar::divDevReff(volVectorField& U) const
tmp<volVectorField> adjointLaminar::adjointMeanFlowSource()
{
return tmp<volVectorField>::New
(
IOobject
return volVectorField::New
(
"adjointMeanFlowSource",
runTime_.timeName(),
IOobject::NO_REGISTER,
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedVector
(
dimensionSet(0, 1, -2, 0, 0),
Zero
)
dimensionedVector(dimensionSet(0, 1, -2, 0, 0), Zero)
);
}
@ -151,16 +134,10 @@ const boundaryVectorField& adjointLaminar::wallFloCoSensitivities()
tmp<volScalarField> adjointLaminar::distanceSensitivities()
{
return tmp<volScalarField>::New
(
IOobject
return volScalarField::New
(
"adjointEikonalSource" + type(),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimLength/pow3(dimTime), Zero)
);
@ -169,16 +146,10 @@ tmp<volScalarField> adjointLaminar::distanceSensitivities()
tmp<volTensorField> adjointLaminar::FISensitivityTerm()
{
return tmp<volTensorField>::New
(
IOobject
return volTensorField::New
(
"volumeSensTerm" + type(),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedTensor(dimensionSet(0, 2, -3, 0, 0), Zero)
);

47
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointSpalartAllmaras/adjointSpalartAllmaras.C
View File

@ -440,32 +440,18 @@ void adjointSpalartAllmaras::updatePrimalRelatedFields()
tmp<volScalarField> adjointSpalartAllmaras::allocateMask()
{
tmp<volScalarField> mask;
if (limitAdjointProduction_)
{
mask = ATCModel::createLimiter(mesh_, coeffDict_);
}
else
{
mask = tmp<volScalarField>
(
new volScalarField
(
IOobject
(
"unitMask",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("unit", dimless, scalar(1))
)
);
return ATCModel::createLimiter(mesh_, coeffDict_);
}
return mask;
return volScalarField::New
(
"unitMask",
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar("unit", dimless, scalar(1))
);
}
@ -714,17 +700,10 @@ tmp<volSymmTensorField> adjointSpalartAllmaras::devReff
const volVectorField& U
) const
{
return
tmp<volSymmTensorField>::New
(
IOobject
return volSymmTensorField::New
(
"devRhoReff",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
-nuEff()*devTwoSymm(fvc::grad(U))
);
}
@ -767,10 +746,8 @@ tmp<volScalarField> adjointSpalartAllmaras::nutJacobianTMVar1() const
tmp<scalarField> adjointSpalartAllmaras::diffusionCoeffVar1(label patchI) const
{
tmp<scalarField> tdiffCoeff
(
new scalarField(mesh_.boundary()[patchI].size(), Zero)
);
auto tdiffCoeff =
tmp<scalarField>::New(mesh_.boundary()[patchI].size(), Zero);
scalarField& diffCoeff = tdiffCoeff.ref();

16
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/adjointkOmegaSST/adjointkOmegaSST.C
View File

@ -125,21 +125,14 @@ tmp<volScalarField::Internal> adjointkOmegaSST::GbyNu
tmp<volScalarField> adjointkOmegaSST::zeroFirstCell()
{
auto tzeroFirstCell =
tmp<volScalarField>::New
(
IOobject
auto tzeroFirstCell = volScalarField::New
(
"zeroFirstCell",
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimless, Foam::one{})
);
volScalarField& zeroFirstCell = tzeroFirstCell.ref();
auto& zeroFirstCell = tzeroFirstCell.ref();
firstCellIDs_.resize(mesh_.nCells(), -1);
label counter(0);
@ -1799,8 +1792,7 @@ tmp<volSymmTensorField> adjointkOmegaSST::devReff
const volVectorField& U
) const
{
return
tmp<volSymmTensorField>::New
return tmp<volSymmTensorField>::New
(
IOobject
(

4
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointTurbulenceModel/adjointTurbulenceModel.H
View File

@ -174,10 +174,10 @@ public:
const autoPtr<incompressible::RASModelVariables>&
turbVars = primalVars_.RASModelVariables();
return
tmp<volScalarField>::New
return volScalarField::New
(
"nuEff",
IOobject::NO_REGISTER,
lamTrans.nu() + turbVars().nut()
);
}

30
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariables.C
View File

@ -305,16 +305,10 @@ tmp<volScalarField> RASModelVariables::nutJacobianVar1
<< "jutJacobianVar1 not implemented for the current turbulence model."
<< "Returning zero field" << endl;
return tmp<volScalarField>::New
(
IOobject
return volScalarField::New
(
"nutJacobianVar1",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimless, Zero)
);
@ -330,16 +324,10 @@ tmp<volScalarField> RASModelVariables::nutJacobianVar2
<< "nutJacobianVar2 not implemented for the current turbulence model."
<< "Returning zero field" << endl;
return tmp<volScalarField>::New
(
IOobject
return volScalarField::New
(
"nutJacobianVar2",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimless, Zero)
);
@ -426,16 +414,10 @@ tmp<volSymmTensorField> RASModelVariables::devReff
const volVectorField& U
) const
{
return tmp<volSymmTensorField>::New
(
IOobject
return volSymmTensorField::New
(
"devRhoReff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
- (laminarTransport.nu() + nut())*devTwoSymm(fvc::grad(U))
);
}

11
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/RASModelVariables/RASModelVariablesI.H
View File

@ -148,17 +148,10 @@ inline tmp<volScalarField> RASModelVariables::nut() const
return tmp<volScalarField>(nutRef());
}
return
tmp<volScalarField>::New
(
IOobject
return volScalarField::New
(
"dummylaminarNut",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimViscosity, Zero)
);

10
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/SpalartAllmaras/SpalartAllmaras.C
View File

@ -80,16 +80,10 @@ tmp<volScalarField> SpalartAllmaras::nutJacobianVar1
const singlePhaseTransportModel& laminarTransport
) const
{
auto tnutJacobian = tmp<volScalarField>::New
(
IOobject
auto tnutJacobian = volScalarField::New
(
"nutJacobianVar1",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::NO_REGISTER,
mesh_,
dimensionedScalar(dimless, Zero)
);

8
src/optimisation/adjointOptimisation/adjoint/turbulenceModels/turbulenceModelVariables/RAS/kOmegaSST/kOmegaSST.C
View File

@ -63,7 +63,8 @@ void kOmegaSST::allocateMeanFields()
mesh_.time().timeName(),
mesh_,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
IOobject::AUTO_WRITE,
IOobject::REGISTER
),
mesh_,
dimensionedScalar(dimArea/pow3(dimTime), Zero)
@ -120,12 +121,13 @@ tmp<volScalarField::Internal> kOmegaSST::computeG()
);
// NB: leave tmp registered (for correctBoundaryConditions)
auto tG =
tmp<volScalarField::Internal>::New
auto tG = volScalarField::Internal::New
(
turbModel.GName(),
IOobject::REGISTER,
nutRefInst()*GbyNu0
);
// Use correctBoundaryConditions instead of updateCoeffs to avoid
// messing with updateCoeffs in the next iteration of omegaEqn
TMVar2Inst().correctBoundaryConditions();