GIT: Resolve conflict with upstream merge from Foundation

src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C

@@ -184,14 +184,8 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
     }
     else
     {
-        FatalErrorIn
-        (
-            "void Foam::externalCoupledTemperatureMixedFvPatchScalarField::"
-            "transferData"
-            "("
-                "Ostream&"
-            ") const"
-        )   << "Condition requires either compressible turbulence and/or "
+        FatalErrorInFunction
+            << "Condition requires either compressible turbulence and/or "
             << "thermo model to be available" << exit(FatalError);
     }
 

src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H

@@ -32,21 +32,43 @@ Description
     application. Values are transferred as plain text files, where OpenFOAM
     data is written as:
 
-        # Patch: <patch name>
-        <magSf1> <value1> <qDot1> <htc1>
-        <magSf2> <value2> <qDot2> <htc2>
-        <magSf3> <value3> <qDot3> <htc2>
+        # Patch: \<patch name\>
+        \<magSf1\> \<value1\> \<qDot1\> \<htc1\>
+        \<magSf2\> \<value2\> \<qDot2\> \<htc2\>
+        \<magSf3\> \<value3\> \<qDot3\> \<htc2\>
         ...
-        <magSfN> <valueN> <qDotN> <htcN>
+        \<magSfN\> \<valueN\> \<qDotN\> \<htcN\>
 
     and received as the constituent pieces of the `mixed' condition, i.e.
 
-        # Patch: <patch name>
-        <refValue1> <refGrad1> <valueFraction1>
-        <refValue2> <refGrad2> <valueFraction2>
-        <refValue3> <refGrad3> <valueFraction3>
-          ...
-        <refValueN> <refGradN> <valueFractionN>
+        # Patch: \<patch name\>
+        \<value1\> \<gradient1\> \<valueFracion1\>
+        \<value2\> \<gradient2\> \<valueFracion2\>
+        \<value3\> \<gradient3\> \<valueFracion3\>
+        ...
+        \<valueN\> \<gradientN\> \<valueFracionN\>
+
+    Data is sent/received as a single file for all patches from the directory
+
+        $FOAM_CASE/\<commsDir\>
+
+    At start-up, the boundary creates a lock file, i.e..
+
+        OpenFOAM.lock
+
+    ... to signal the external source to wait.  During the boundary condition
+    update, boundary values are written to file, e.g.
+
+        \<fileName\>.out
+
+    The lock file is then removed, instructing the external source to take
+    control of the program execution.  When ready, the external program
+    should create the return values, e.g. to file
+
+        \<fileName\>.in
+
+    ... and then re-instate the lock file.  The boundary condition will then
+    read the return values, and pass program execution back to OpenFOAM.
 
     To be used in combination with the externalCoupled functionObject.