mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Partial revert "ENH: add GeometricField constructor for movable internal field"
Compilation problems on older compilers
This reverts commit baf3e931de.
This commit is contained in:
@ -327,52 +327,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
|
||||
}
|
||||
|
||||
|
||||
template<class Type, template<class> class PatchField, class GeoMesh>
|
||||
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
|
||||
(
|
||||
const IOobject& io,
|
||||
const Mesh& mesh,
|
||||
const dimensionSet& ds,
|
||||
Field<Type>&& iField,
|
||||
const PtrList<PatchField<Type>>& ptfl
|
||||
)
|
||||
:
|
||||
Internal(io, mesh, ds, std::move(iField)),
|
||||
timeIndex_(this->time().timeIndex()),
|
||||
field0Ptr_(nullptr),
|
||||
fieldPrevIterPtr_(nullptr),
|
||||
boundaryField_(mesh.boundary(), *this, ptfl)
|
||||
{
|
||||
DebugInFunction
|
||||
<< "Move construct from components" << nl << this->info() << endl;
|
||||
|
||||
readIfPresent();
|
||||
}
|
||||
|
||||
|
||||
template<class Type, template<class> class PatchField, class GeoMesh>
|
||||
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
|
||||
(
|
||||
const IOobject& io,
|
||||
const Mesh& mesh,
|
||||
const dimensionSet& ds,
|
||||
List<Type>&& iField,
|
||||
const PtrList<PatchField<Type>>& ptfl
|
||||
)
|
||||
:
|
||||
Internal(io, mesh, ds, std::move(iField)),
|
||||
timeIndex_(this->time().timeIndex()),
|
||||
field0Ptr_(nullptr),
|
||||
fieldPrevIterPtr_(nullptr),
|
||||
boundaryField_(mesh.boundary(), *this, ptfl)
|
||||
{
|
||||
DebugInFunction
|
||||
<< "Move construct from components" << nl << this->info() << endl;
|
||||
|
||||
readIfPresent();
|
||||
}
|
||||
|
||||
|
||||
template<class Type, template<class> class PatchField, class GeoMesh>
|
||||
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
|
||||
(
|
||||
|
||||
@ -354,26 +354,6 @@ public:
|
||||
const PtrList<PatchField<Type>>& ptfl
|
||||
);
|
||||
|
||||
//- Construct from components, moving initial internal field
|
||||
GeometricField
|
||||
(
|
||||
const IOobject& io,
|
||||
const Mesh& mesh,
|
||||
const dimensionSet& ds,
|
||||
Field<Type>&& iField,
|
||||
const PtrList<PatchField<Type>>& ptfl
|
||||
);
|
||||
|
||||
//- Construct from components, moving initial internal field
|
||||
GeometricField
|
||||
(
|
||||
const IOobject& io,
|
||||
const Mesh& mesh,
|
||||
const dimensionSet& ds,
|
||||
List<Type>&& iField,
|
||||
const PtrList<PatchField<Type>>& ptfl
|
||||
);
|
||||
|
||||
//- Construct and read given IOobject
|
||||
GeometricField
|
||||
(
|
||||
|
||||
@ -96,7 +96,6 @@ fvMeshSubset::interpolate
|
||||
),
|
||||
sMesh,
|
||||
vf.dimensions(),
|
||||
// Move construct for internal field
|
||||
Field<Type>(vf.primitiveField(), cellMap),
|
||||
patchFields
|
||||
);
|
||||
@ -232,7 +231,6 @@ fvMeshSubset::interpolate
|
||||
),
|
||||
sMesh,
|
||||
vf.dimensions(),
|
||||
// Move construct for internal field
|
||||
Field<Type>
|
||||
(
|
||||
vf.primitiveField(),
|
||||
@ -409,7 +407,6 @@ fvMeshSubset::interpolate
|
||||
),
|
||||
sMesh,
|
||||
vf.dimensions(),
|
||||
// Move construct for internal field
|
||||
Field<Type>(vf.primitiveField(), pointMap),
|
||||
patchFields
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user