Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C

@@ -45,11 +45,11 @@ Foam::FitData<Form, ExtendedStencil, Polynomial>::FitData
     linearCorrection_(linearCorrection),
     linearLimitFactor_(linearLimitFactor),
     centralWeight_(centralWeight),
-#   ifdef SPHERICAL_GEOMETRY
+    #ifdef SPHERICAL_GEOMETRY
     dim_(2),
-#   else
+    #else
     dim_(mesh.nGeometricD()),
-#   endif
+    #endif
     minSize_(Polynomial::nTerms(dim_))
 {
     // Check input
@@ -79,7 +79,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::findFaceDirs
     idir = mesh.faceAreas()[facei];
     idir /= mag(idir);
 
-#   ifndef SPHERICAL_GEOMETRY
+    #ifndef SPHERICAL_GEOMETRY
     if (mesh.nGeometricD() <= 2) // find the normal direction
     {
         if (mesh.geometricD()[0] == -1)
@@ -100,10 +100,10 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::findFaceDirs
         const face& f = mesh.faces()[facei];
         kdir = mesh.points()[f[0]] - mesh.faceCentres()[facei];
     }
-#   else
+    #else
     // Spherical geometry so kdir is the radial direction
     kdir = mesh.faceCentres()[facei];
-#   endif
+    #endif
 
     if (mesh.nGeometricD() == 3)
     {
@@ -170,11 +170,11 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
 
         d.x() = (p - p0)&idir;
         d.y() = (p - p0)&jdir;
-#       ifndef SPHERICAL_GEOMETRY
+        #ifndef SPHERICAL_GEOMETRY
         d.z() = (p - p0)&kdir;
-#       else
+        #else
         d.z() = mag(p) - mag(p0);
-#       endif
+        #endif
 
         if (ip == 0)
         {

src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C

@@ -241,10 +241,14 @@ void Foam::radiation::P1::calculate()
     );
 
     // Calculate radiative heat flux on boundaries.
-    forAll(mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchi)
     {
-        Qr_.boundaryField()[patchI] =
-            -gamma.boundaryField()[patchI]*G_.boundaryField()[patchI].snGrad();
+        if (!G_.boundaryField()[patchi].coupled())
+        {
+            Qr_.boundaryField()[patchi] =
+                -gamma.boundaryField()[patchi]
+                *G_.boundaryField()[patchi].snGrad();
+        }
     }
 }