mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
660f3e5492
Improve alignment of its behaviour with std::unique_ptr
- element_type typedef
- release() method - identical to ptr() method
- get() method to get the pointer without checking and without releasing it.
- operator*() for dereferencing
Method name changes
- renamed rawPtr() to get()
- renamed rawRef() to ref(), removed unused const version.
Removed methods/operators
- assignment from a raw pointer was deleted (was rarely used).
Can be convenient, but uncontrolled and potentially unsafe.
Do allow assignment from a literal nullptr though, since this
can never leak (and also corresponds to the unique_ptr API).
Additional methods
- clone() method: forwards to the clone() method of the underlying
data object with argument forwarding.
- reset(autoPtr&&) as an alternative to operator=(autoPtr&&)
STYLE: avoid implicit conversion from autoPtr to object type in many places
- existing implementation has the following:
operator const T&() const { return operator*(); }
which means that the following code works:
autoPtr<mapPolyMesh> map = ...;
updateMesh(*map); // OK: explicit dereferencing
updateMesh(map()); // OK: explicit dereferencing
updateMesh(map); // OK: implicit dereferencing
for clarity it may preferable to avoid the implicit dereferencing
- prefer operator* to operator() when deferenced a return value
so it is clearer that a pointer is involve and not a function call
etc Eg, return *meshPtr_; vs. return meshPtr_();
218 lines
3.5 KiB
C
218 lines
3.5 KiB
C
Info<< "Reading thermophysical properties\n" << endl;
|
|
|
|
autoPtr<psiuReactionThermo> pThermo
|
|
(
|
|
psiuReactionThermo::New(mesh)
|
|
);
|
|
psiuReactionThermo& thermo = pThermo();
|
|
thermo.validate(args.executable(), "ha", "ea");
|
|
|
|
basicMultiComponentMixture& composition = thermo.composition();
|
|
|
|
volScalarField rho
|
|
(
|
|
IOobject
|
|
(
|
|
"rho",
|
|
runTime.timeName(),
|
|
mesh,
|
|
IOobject::NO_READ,
|
|
IOobject::AUTO_WRITE
|
|
),
|
|
thermo.rho()
|
|
);
|
|
|
|
volScalarField& p = thermo.p();
|
|
|
|
volScalarField& b = composition.Y("b");
|
|
Info<< "min(b) = " << min(b).value() << endl;
|
|
|
|
Info<< "\nReading field U\n" << endl;
|
|
volVectorField U
|
|
(
|
|
IOobject
|
|
(
|
|
"U",
|
|
runTime.timeName(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::AUTO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
#include "compressibleCreatePhi.H"
|
|
|
|
mesh.setFluxRequired(p.name());
|
|
|
|
Info<< "Creating turbulence model\n" << endl;
|
|
autoPtr<compressible::RASModel> turbulence
|
|
(
|
|
compressible::New<compressible::RASModel>
|
|
(
|
|
rho,
|
|
U,
|
|
phi,
|
|
thermo
|
|
)
|
|
);
|
|
|
|
|
|
Info<< "Creating the unstrained laminar flame speed\n" << endl;
|
|
autoPtr<laminarFlameSpeed> unstrainedLaminarFlameSpeed
|
|
(
|
|
laminarFlameSpeed::New(thermo)
|
|
);
|
|
|
|
|
|
Info<< "Reading strained laminar flame speed field Su\n" << endl;
|
|
volScalarField Su
|
|
(
|
|
IOobject
|
|
(
|
|
"Su",
|
|
runTime.timeName(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::AUTO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
Info<< "Reading field betav\n" << endl;
|
|
volScalarField betav
|
|
(
|
|
IOobject
|
|
(
|
|
"betav",
|
|
mesh.facesInstance(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::NO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
Info<< "Reading field Lobs\n" << endl;
|
|
volScalarField Lobs
|
|
(
|
|
IOobject
|
|
(
|
|
"Lobs",
|
|
mesh.facesInstance(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::NO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
Info<< "Reading field CT\n" << endl;
|
|
volSymmTensorField CT
|
|
(
|
|
IOobject
|
|
(
|
|
"CT",
|
|
mesh.facesInstance(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::NO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
Info<< "Reading field Nv\n" << endl;
|
|
volScalarField Nv
|
|
(
|
|
IOobject
|
|
(
|
|
"Nv",
|
|
mesh.facesInstance(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::NO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
Info<< "Reading field nsv\n" << endl;
|
|
volSymmTensorField nsv
|
|
(
|
|
IOobject
|
|
(
|
|
"nsv",
|
|
mesh.facesInstance(),
|
|
mesh,
|
|
IOobject::MUST_READ,
|
|
IOobject::NO_WRITE
|
|
),
|
|
mesh
|
|
);
|
|
|
|
IOdictionary PDRProperties
|
|
(
|
|
IOobject
|
|
(
|
|
"PDRProperties",
|
|
runTime.constant(),
|
|
mesh,
|
|
IOobject::MUST_READ_IF_MODIFIED,
|
|
IOobject::NO_WRITE
|
|
)
|
|
);
|
|
|
|
//- Create the drag model
|
|
autoPtr<PDRDragModel> drag = PDRDragModel::New
|
|
(
|
|
PDRProperties,
|
|
*turbulence,
|
|
rho,
|
|
U,
|
|
phi
|
|
);
|
|
|
|
//- Create the flame-wrinkling model
|
|
autoPtr<XiModel> flameWrinkling = XiModel::New
|
|
(
|
|
PDRProperties,
|
|
thermo,
|
|
*turbulence,
|
|
Su,
|
|
rho,
|
|
b,
|
|
phi
|
|
);
|
|
|
|
Info<< "Calculating turbulent flame speed field St\n" << endl;
|
|
volScalarField St
|
|
(
|
|
IOobject
|
|
(
|
|
"St",
|
|
runTime.timeName(),
|
|
mesh,
|
|
IOobject::NO_READ,
|
|
IOobject::AUTO_WRITE
|
|
),
|
|
flameWrinkling->Xi()*Su
|
|
);
|
|
|
|
|
|
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
|
|
|
|
if (composition.contains("ft"))
|
|
{
|
|
fields.add(composition.Y("ft"));
|
|
}
|
|
|
|
fields.add(b);
|
|
fields.add(thermo.he());
|
|
fields.add(thermo.heu());
|
|
flameWrinkling->addXi(fields);
|
|
|
|
#include "createDpdt.H"
|
|
|
|
#include "createK.H"
|
|
|
|
#include "createMRF.H"
|