From 64d1bd74889649a339237a40c4a5e6266a4f59f7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Feb 2023 14:23:01 +0100
Subject: [PATCH] WIP: edge field

---
 src/finiteArea/fields/edgeFields/edgeFields.C       |  2 ++
 src/finiteArea/fields/edgeFields/edgeFieldsFwd.H    |  1 +
 .../basic/calculated/calculatedFaePatchFields.C     | 13 ++++---------
 .../basic/calculated/calculatedFaePatchFields.H     |  1 +
 .../basic/coupled/coupledFaePatchFields.C           |  7 +++----
 .../basic/coupled/coupledFaePatchFields.H           |  1 +
 .../constraint/processor/processorFaePatchFields.C  | 13 ++++---------
 .../constraint/processor/processorFaePatchFields.H  |  1 +
 .../faePatchFields/faePatchField/faePatchFields.C   |  1 +
 .../faePatchField/faePatchFieldsFwd.H               |  1 +
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/finiteArea/fields/edgeFields/edgeFields.C b/src/finiteArea/fields/edgeFields/edgeFields.C
index bcd0451367..145034e0de 100644
--- a/src/finiteArea/fields/edgeFields/edgeFields.C
+++ b/src/finiteArea/fields/edgeFields/edgeFields.C
@@ -33,12 +33,14 @@ License
 namespace Foam
 {
 
+defineTemplateTypeNameAndDebug(edgeLabelField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeScalarField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeVectorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeSphericalTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeSymmTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeTensorField::Internal, 0);
 
+defineTemplateTypeNameAndDebug(edgeLabelField, 0);
 defineTemplateTypeNameAndDebug(edgeScalarField, 0);
 defineTemplateTypeNameAndDebug(edgeVectorField, 0);
 defineTemplateTypeNameAndDebug(edgeSphericalTensorField, 0);
diff --git a/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H b/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
index e8ead27a34..7c3ceb105a 100644
--- a/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
+++ b/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
@@ -60,6 +60,7 @@ template<class Type> class faePatchField;
 
 // Typedefs
 
+typedef GeometricField<label, faePatchField, edgeMesh> edgeLabelField;
 typedef GeometricField<scalar, faePatchField, edgeMesh> edgeScalarField;
 typedef GeometricField<vector, faePatchField, edgeMesh> edgeVectorField;
 typedef GeometricField<sphericalTensor, faePatchField, edgeMesh>
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C
index f30f4c2c7a..798ba1b6fc 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C
@@ -29,17 +29,12 @@ License
 #include "calculatedFaePatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFaePatchFields(calculated);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFaePatchFields(calculated);
+    makeFaePatchFieldType(label, calculated);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
index 9553681d3f..d28e869cbd 100644
--- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.H
@@ -38,6 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makeFaePatchTypeFieldTypedefs(calculated);
+makeFaePatchFieldTypedef(label, calculated);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
index 336c5e3910..ea00e3ecfa 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C
@@ -33,9 +33,8 @@ License
 
 namespace Foam
 {
-
-makeFaePatchFieldsTypeName(coupled);
-
-} // End namespace Foam
+    makeFaePatchFieldsTypeName(coupled);
+    makeFaePatchFieldTypeName(label, coupled);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
index cced89e837..7884396cc5 100644
--- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.H
@@ -38,6 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makeFaePatchTypeFieldTypedefs(coupled);
+makeFaePatchFieldTypedef(label, coupled);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C
index 60e6ac337e..0f66104d11 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C
@@ -29,17 +29,12 @@ License
 #include "faePatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeFaePatchFields(processor);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    makeFaePatchFields(processor);
+    makeFaePatchFieldType(label, processor);
+}
 
 // ************************************************************************* //
diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
index 907809c4b5..be39dea034 100644
--- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
+++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.H
@@ -38,6 +38,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makeFaePatchTypeFieldTypedefs(processor);
+makeFaePatchFieldTypedef(label, processor);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
index cba506b3a9..aafdc43e9e 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C
@@ -38,6 +38,7 @@ namespace Foam
     defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
     defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
+makeFaePatchField(faePatchLabelField);
 makeFaePatchField(faePatchScalarField);
 makeFaePatchField(faePatchVectorField);
 makeFaePatchField(faePatchSphericalTensorField);
diff --git a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
index 36e49bdf5e..5bdfeefabc 100644
--- a/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
+++ b/src/finiteArea/fields/faePatchFields/faePatchField/faePatchFieldsFwd.H
@@ -42,6 +42,7 @@ namespace Foam
 
 template<class Type> class faePatchField;
 
+typedef faePatchField<label> faePatchLabelField;
 typedef faePatchField<scalar> faePatchScalarField;
 typedef faePatchField<vector> faePatchVectorField;
 typedef faePatchField<sphericalTensor> faePatchSphericalTensorField;