Merge branch 'master' of ssh://git.code.sf.net/p/foam-extend/foam-extend-4.1

src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFTotalPressure/SRFTotalPressureFvPatchScalarField.C

@@ -170,8 +170,8 @@ void SRFTotalPressureFvPatchScalarField::updateCoeffs(const vectorField& Up)
         return;
     }
 
-    const fvsPatchField<scalar>& phip =
+    const fvsPatchScalarField& phip =
-        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+        lookupPatchField<surfaceScalarField, scalar>(phiName_);
 
     if (psiName_ == "none" && rhoName_ == "none")
     {

src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C

@@ -117,6 +117,18 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
         return;
     }
 
+    if (!this->db().objectRegistry::found(phiName_))
+    {
+        // Flux not available, do not update
+        InfoInFunction
+            << "Flux field " << phiName_ << " not found.  "
+            << "Performing fixed value update" << endl;
+
+        fixedValueFvPatchVectorField::updateCoeffs();
+
+        return;
+    }
+
 //     if (patch().boundaryMesh().mesh().moving())
 //     {
 //         WarningIn
@@ -159,7 +171,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
             << nl << exit(FatalError);
     }
 
-    fixedValueFvPatchField<vector>::updateCoeffs();
+    fixedValueFvPatchVectorField::updateCoeffs();
 }
 
 

src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/Gamma/multivariateGamma.C

@@ -37,6 +37,15 @@ namespace Foam
         Gamma,
         GammaLimiter
     )
+
+    makeLLimitedMultivariateSurfaceInterpolationScheme
+    (
+        Gamma01,
+        Limited01Limiter,
+        GammaLimiter,
+        NVDTVD,
+        magSqr
+    )
 }
 
 // ************************************************************************* //

src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.H

@@ -45,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class multivariateScheme Declaration
+                   Class multivariateScheme Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type, class Scheme>