From 1faa143a7c38b1949b40b6f25c108d036229821a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 24 Oct 2023 22:28:01 +0200
Subject: [PATCH] ENH: expose fieldNames() selection for
 sampledSets/sampledSurfaces

- consistent with probes. Allows reporting/querying
---
 .../test/surface-sampling/Test-surface-sampling.C      | 10 +++++++++-
 src/sampling/sampledSet/sampledSets/sampledSets.H      |  3 +++
 .../sampledSurface/sampledSurfaces/sampledSurfaces.H   |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/applications/test/surface-sampling/Test-surface-sampling.C b/applications/test/surface-sampling/Test-surface-sampling.C
index bec2a2a71c..a661b2d0ed 100644
--- a/applications/test/surface-sampling/Test-surface-sampling.C
+++ b/applications/test/surface-sampling/Test-surface-sampling.C
@@ -184,7 +184,15 @@ int main(int argc, char *argv[])
     // Construct from Time and dictionary, without loadFromFiles
     sampledSurfaces sampling("test-sample", runTime, *sampleDict);
 
-    Info<< "Loaded " << sampling.size() << " surface samplers" << nl;
+    #if (OPENFOAM <= 2306)
+    Info<< "Loaded " << sampling.size() << " surface samplers, fields: "
+        << flatOutput(sampleDict->getOrDefault<wordRes>("fields", wordRes()))
+        << nl;
+    #else
+    Info<< "Loaded " << sampling.size() << " surface samplers, fields: "
+        << flatOutput(sampling.fieldNames())
+        << nl;
+    #endif
 
     if (sampling.empty())
     {
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 76623ad911..7eb7881b22 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -306,6 +306,9 @@ public:
         //  \return old value
         bool verbose(const bool on) noexcept;
 
+        //- Return names of fields to sample
+        const wordRes& fieldNames() const noexcept { return fieldSelection_; }
+
         //- Read the sampledSets
         virtual bool read(const dictionary&);
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index 45d25bcd87..f0424c0770 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -349,6 +349,9 @@ public:
         //  \return old value
         bool verbose(const bool on) noexcept;
 
+        //- Return names of fields to sample
+        const wordRes& fieldNames() const noexcept { return fieldSelection_; }
+
         //- Read the sampledSurfaces dictionary
         virtual bool read(const dictionary& dict);