functionObjects::surfaceRegion: Write the surface geometry for formats in which the data is in separate files

src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.C

@@ -371,7 +371,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::combineSurfaceGeometry
 
         if (Pstream::parRun())
         {
-            // dimension as fraction of mesh bounding box
+            // Dimension as fraction of mesh bounding box
             scalar mergeDim = 1e-10*mesh().bounds().mag();
 
             labelList pointsMap;
@@ -538,6 +538,8 @@ void Foam::functionObjects::fieldValues::surfaceRegion::writeFileHeader
     const label i
 )
 {
+    if (operation_ != opNone)
+    {
         writeCommented(file(), "Region type : ");
         file() << regionTypeNames_[regionType_] << " " << regionName_ << endl;
         writeCommented(file(), "Faces  : ");
@@ -559,6 +561,7 @@ void Foam::functionObjects::fieldValues::surfaceRegion::writeFileHeader
         }
 
         file() << endl;
+    }
 }
 
 
@@ -723,14 +726,17 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::read
 
 bool Foam::functionObjects::fieldValues::surfaceRegion::write()
 {
+    if (operation_ != opNone)
+    {
         fieldValue::write();
+    }
 
     if (surfacePtr_.valid())
     {
         surfacePtr_().update();
     }
 
-    if (Pstream::master())
+    if (operation_ != opNone && Pstream::master())
     {
         writeTime(file());
     }
@@ -738,14 +744,42 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::write()
     if (writeArea_)
     {
         totalArea_ = totalArea();
-        if (Pstream::master())
+        if (operation_ != opNone && Pstream::master())
         {
             file() << tab << totalArea_;
         }
         Log << "    total area = " << totalArea_ << endl;
     }
 
-    // construct weight field. Note: zero size means weight = 1
+    // Write the surface geometry
+    if (surfaceWriterPtr_.valid())
+    {
+        faceList faces;
+        pointField points;
+
+        if (surfacePtr_.valid())
+        {
+            combineSurfaceGeometry(faces, points);
+        }
+        else
+        {
+            combineMeshGeometry(faces, points);
+        }
+
+        if (Pstream::master())
+        {
+            surfaceWriterPtr_->write
+            (
+                outputDir(),
+                regionTypeNames_[regionType_] + ("_" + regionName_),
+                points,
+                faces,
+                false
+            );
+        }
+    }
+
+    // Construct weight field. Note: zero size means weight = 1
     scalarField weightField;
     if (weightFieldName_ != "none")
     {
@@ -761,7 +795,7 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::write()
     // Combine onto master
     combineFields(weightField);
 
-    // process the fields
+    // Process the fields
     forAll(fields_, i)
     {
         const word& fieldName = fields_[i];
@@ -784,9 +818,9 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::write()
         }
     }
 
-    if (Pstream::master())
+    if (operation_ != opNone && Pstream::master())
     {
-        file()<< endl;
+        file() << endl;
     }
 
     Log << endl;

src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegion.H

@@ -113,7 +113,7 @@ Note
       faces
     - the `oriented' entries relate to mesh-oriented fields, such as the
       flux, phi.  These fields will be oriented according to the face normals.
-    - using \c sampledSurfaces:
+    - using \c sampledSurface:
         - not available for surface fields
         - if interpolate=true they use \c interpolationCellPoint
           otherwise they use cell values
@@ -371,6 +371,9 @@ public:
         //- Return the list of +1/-1 representing face flip map
         inline const labelList& faceSign() const;
 
+        //- Return the output directory
+        inline fileName outputDir() const;
+
         //- Templated helper function to output field values
         template<class Type>
         bool writeValues

src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegionI.H

@@ -55,4 +55,11 @@ Foam::functionObjects::fieldValues::surfaceRegion::faceSign() const
 }
 
 
+inline Foam::fileName
+Foam::functionObjects::fieldValues::surfaceRegion::outputDir() const
+{
+    return baseFileDir()/name()/"surface"/obr_.time().timeName();
+}
+
+
 // ************************************************************************* //

src/functionObjects/field/fieldValues/surfaceRegion/surfaceRegionTemplates.C

@@ -315,13 +315,10 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::writeValues
 
             if (Pstream::master())
             {
-                fileName outputDir =
-                    baseFileDir()/name()/"surface"/obr_.time().timeName();
-
                 surfaceWriterPtr_->write
                 (
-                    outputDir,
+                    outputDir(),
-                    word(regionTypeNames_[regionType_]) + "_" + regionName_,
+                    regionTypeNames_[regionType_] + ("_" + regionName_),
                     points,
                     faces,
                     fieldName,
@@ -331,7 +328,8 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::writeValues
             }
         }
 
-
+        if (operation_ != opNone)
+        {
             // Apply scale factor
             values *= scaleFactor_;
 
@@ -342,13 +340,14 @@ bool Foam::functionObjects::fieldValues::surfaceRegion::writeValues
                 // Add to result dictionary, over-writing any previous entry
                 resultDict_.add(fieldName, result, true);
 
-            file()<< tab << result;
+                file() << tab << result;
 
                 Log << "    " << operationTypeNames_[operation_]
                     << "(" << regionName_ << ") of " << fieldName
                     <<  " = " << result << endl;
             }
         }
+    }
 
     return ok;
 }