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

src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,10 +54,21 @@ buoyantPressureFvPatchScalarField
 :
     fixedGradientFvPatchScalarField(p, iF),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
+{
+    if (dict.found("value") && dict.found("gradient"))
+    {
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+        gradient() = scalarField("gradient", dict, p.size());
+    }
+    else
     {
         fvPatchField<scalar>::operator=(patchInternalField());
         gradient() = 0.0;
     }
+}
 
 
 Foam::buoyantPressureFvPatchScalarField::

src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,11 +77,13 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
     DpName_(dict.lookupOrDefault<word>("Dp", "Dp")),
     adjoint_(dict.lookupOrDefault<Switch>("adjoint", false))
 {
-    if (dict.found("gradient"))
+    if (dict.found("value") && dict.found("gradient"))
     {
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
         gradient() = scalarField("gradient", dict, p.size());
-        fixedGradientFvPatchScalarField::updateCoeffs();
-        fixedGradientFvPatchScalarField::evaluate();
     }
     else
     {
@@ -190,7 +192,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
 
 void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    fixedGradientFvPatchScalarField::write(os);
     writeEntryIfDifferent<word>(os, "phiHbyA", "phiHbyA", phiHbyAName_);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
@@ -199,7 +201,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
     {
         os.writeKeyword("adjoint") << adjoint_ << token::END_STATEMENT << nl;
     }
-    gradient().writeEntry("gradient", os);
+    writeEntry("value", os);
 }
 
 

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.C

@@ -481,7 +481,8 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
     const scalarField& srcMagSf,
     const scalarField& tgtMagSf,
     const faceAreaIntersect::triangulationMode& triMode,
-    const bool reverseTarget
+    const bool reverseTarget,
+    const bool restartUncoveredSourceFace
 )
 :
     AMIMethod<SourcePatch, TargetPatch>
@@ -492,7 +493,8 @@ Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::faceAreaWeightAMI
         tgtMagSf,
         triMode,
         reverseTarget
-    )
+    ),
+    restartUncoveredSourceFace_(restartUncoveredSourceFace)
 {}
 
 
@@ -557,7 +559,7 @@ void Foam::faceAreaWeightAMI<SourcePatch, TargetPatch>::calculate
 
 
     // Check for badly covered faces
-    if (debug)
+    if (restartUncoveredSourceFace_)
     {
         restartUncoveredSourceFace
         (

src/meshTools/AMIInterpolation/AMIInterpolation/AMIMethod/faceAreaWeightAMI/faceAreaWeightAMI.H

@@ -51,6 +51,13 @@ class faceAreaWeightAMI
 :
     public AMIMethod<SourcePatch, TargetPatch>
 {
+private:
+
+    // Private data
+
+        //- Flag to restart uncovered source faces
+        const bool restartUncoveredSourceFace_;
+
 
 protected:
 
@@ -136,7 +143,8 @@ public:
             const scalarField& srcMagSf,
             const scalarField& tgtMagSf,
             const faceAreaIntersect::triangulationMode& triMode,
-            const bool reverseTarget = false
+            const bool reverseTarget = false,
+            const bool restartUncoveredSourceFace = true
         );
 
 

src/meshTools/searchableSurface/searchableSphere.C

@@ -48,12 +48,10 @@ Foam::pointIndexHit Foam::searchableSphere::findNearest
     pointIndexHit info(false, sample, -1);
 
     const vector n(sample - centre_);
-    scalar magSqrN = magSqr(n);
+    scalar magN = mag(n);
 
-    if (nearestDistSqr >= magSqrN)
+    if (nearestDistSqr >= sqr(magN - radius_))
     {
-        scalar magN = Foam::sqrt(magSqrN);
-
         if (magN < ROOTVSMALL)
         {
             info.rawPoint() = centre_ + vector(1,0,0)*radius_;