From edd93728e242d91ac973699665cc3f8e22303b7a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Oct 2018 08:36:28 +0200
Subject: [PATCH] Partial revert "ENH: add GeometricField constructor for
movable internal field"
Compilation problems on older compilers
This reverts commit baf3e931de2ab59efbf3d005146689359b022e1f.
---
.../GeometricField/GeometricField.C | 46 -------------------
.../GeometricField/GeometricField.H | 20 --------
.../fvMeshSubset/fvMeshSubsetInterpolate.C | 3 --
3 files changed, 69 deletions(-)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index d6fbc678db7..e7a088c522e 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -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
(
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index b847f01c8bf..a7941db125c 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -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
(
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index b65dbea1dcd..0bb4b87cc26 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -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
);
--
GitLab