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

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H

@@ -7,6 +7,11 @@ if (pimple.nCorr() <= 1)
 
 phi = (fvc::interpolate(U) & mesh.Sf());
 
+if (ddtPhiCorr)
+{
+    phi += fvc::ddtPhiCorr(rAU, U, phi);
+}
+
 if (p.needReference())
 {
     fvc::makeRelative(phi, U);

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H

@@ -8,3 +8,5 @@
     const bool checkMeshCourantNo =
         pimpleDict.lookupOrDefault("checkMeshCourantNo", false);
 
+    const bool ddtPhiCorr =
+        pimpleDict.lookupOrDefault("ddtPhiCorr", true);

applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C

@@ -58,6 +58,9 @@ int main(int argc, char *argv[])
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
+    surfaceScalarField phiAbs("phiAbs", phi);
+    fvc::makeAbsolute(phiAbs, U);
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     Info<< "\nStarting time loop\n" << endl;
 
@@ -67,9 +70,6 @@ int main(int argc, char *argv[])
         #include "alphaCourantNo.H"
         #include "CourantNo.H"
 
-        // Make the fluxes absolute
-        fvc::makeAbsolute(phi, U);
-
         #include "setDeltaT.H"
 
         runTime++;
@@ -78,8 +78,18 @@ int main(int argc, char *argv[])
 
         scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
 
+        {
+            // Calculate the relative velocity used to map the relative flux phi
+            volVectorField Urel("Urel", U);
+
+            if (mesh.moving())
+            {
+                Urel -= fvc::reconstruct(fvc::meshPhi(U));
+            }
+
             // Do any mesh changes
             mesh.update();
+        }
 
         if (mesh.changing())
         {
@@ -96,9 +106,6 @@ int main(int argc, char *argv[])
             #include "correctPhi.H"
         }
 
-        // Make the fluxes relative to the mesh motion
-        fvc::makeRelative(phi, U);
-
         if (mesh.changing() && checkMeshCourantNo)
         {
             #include "meshCourantNo.H"

applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H

@@ -3,16 +3,19 @@
     surfaceScalarField rAUf(fvc::interpolate(rAU));
 
     U = rAU*UEqn.H();
-    surfaceScalarField phiU("phiU", (fvc::interpolate(U) & mesh.Sf()));
+
+    phiAbs =
+        (fvc::interpolate(U) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU, rho, U, phiAbs);
 
     if (p_rgh.needReference())
     {
-        fvc::makeRelative(phiU, U);
+        fvc::makeRelative(phiAbs, U);
-        adjustPhi(phiU, U, p_rgh);
+        adjustPhi(phiAbs, U, p_rgh);
-        fvc::makeAbsolute(phiU, U);
+        fvc::makeAbsolute(phiAbs, U);
     }
 
-    phi = phiU +
+    phi = phiAbs +
     (
         fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
       - ghf*fvc::snGrad(rho)
@@ -38,11 +41,13 @@
         }
     }
 
-    U += rAU*fvc::reconstruct((phi - phiU)/rAUf);
+    U += rAU*fvc::reconstruct((phi - phiAbs)/rAUf);
     U.correctBoundaryConditions();
 
     #include "continuityErrs.H"
 
+    phiAbs = phi;
+
     // Make the fluxes relative to the mesh motion
     fvc::makeRelative(phi, U);
 

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -936,12 +936,6 @@ int main(int argc, char *argv[])
     const word dictName
         (args.optionLookupOrDefault<word>("dict", "extrudeToRegionMeshDict"));
 
-    mappedPatchBase::sampleMode sampleMode = mappedPatchBase::NEARESTPATCHFACE;
-    if (args.optionFound("AMI"))
-    {
-        sampleMode = mappedPatchBase::NEARESTPATCHFACEAMI;
-    }
-
     IOdictionary dict
     (
         IOobject
@@ -966,6 +960,9 @@ int main(int argc, char *argv[])
         dict.lookup("faceZonesShadow") >> zoneShadowNames;
     }
 
+    mappedPatchBase::sampleMode sampleMode =
+        mappedPatchBase::sampleModeNames_[dict.lookup("sampleMode")];
+
     const Switch oneD(dict.lookup("oneD"));
     const Switch adaptMesh(dict.lookup("adaptMesh"));
 

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict

@@ -32,6 +32,9 @@ faceZones (f0);
 // mapped patch which might need to be adapted.
 adaptMesh       true;
 
+// Sample mode for inter-region communication
+sampleMode      nearestPatchFace;
+
 // Extrude 1D-columns of cells?
 oneD            false;
 

src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.C

@@ -40,7 +40,7 @@ Foam::Field<Type> Foam::interpolateSplineXY
 
     forAll(xNew, i)
     {
-        yNew[i] = interpolateSmoothXY(xNew[i], xOld, yOld);
+        yNew[i] = interpolateSplineXY(xNew[i], xOld, yOld);
     }
 
     return yNew;

src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C

@@ -107,7 +107,7 @@ bool Foam::adjustPhi
         {
             massCorr = (massIn - fixedMassOut)/adjustableMassOut;
         }
-        else if (mag(fixedMassOut - massIn)/totalFlux > 1e-10)
+        else if (mag(fixedMassOut - massIn)/totalFlux > 1e-8)
         {
             FatalErrorIn
             (

src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C

@@ -114,21 +114,68 @@ void Foam::mappedFixedInternalValueFvPatchField<Type>::updateCoeffs()
     const mappedPatchBase& mpp =
         refCast<const mappedPatchBase>(this->patch().patch());
     const fvMesh& nbrMesh = refCast<const fvMesh>(mpp.sampleMesh());
-    const label samplePatchI = mpp.samplePolyPatch().index();
-    const fvPatch& nbrPatch = nbrMesh.boundary()[samplePatchI];
 
+    Field<Type> nbrIntFld;
 
-    // Retrieve the neighbour field
+    switch (mpp.mode())
-    const fvPatchField<Type>& nbrField =
+    {
-        nbrPatch.template lookupPatchField<FieldType, Type>
+        case mappedPatchBase::NEARESTCELL:
+        {
+            FatalErrorIn
             (
-            this->dimensionedInternalField().name()
+                "void mappedFixedValueFvPatchField<Type>::updateCoeffs()"
-        );
+            )   << "Cannot apply "
+                << mappedPatchBase::sampleModeNames_
+                   [
+                       mappedPatchBase::NEARESTCELL
+                   ]
+                << " mapping mode for patch " << this->patch().name()
+                << exit(FatalError);
 
-    // Retrieve the neighbour patch internal field
+            break;
-    Field<Type> nbrIntFld(nbrField.patchInternalField());
+        }
+        case mappedPatchBase::NEARESTPATCHFACE:
+        {
+            const label samplePatchI = mpp.samplePolyPatch().index();
+            const fvPatchField<Type>& nbrPatchField =
+                this->sampleField().boundaryField()[samplePatchI];
+            nbrIntFld = nbrPatchField.patchInternalField();
             mpp.distribute(nbrIntFld);
 
+            break;
+        }
+        case mappedPatchBase::NEARESTFACE:
+        {
+            Field<Type> allValues(nbrMesh.nFaces(), pTraits<Type>::zero);
+
+            const FieldType& nbrField = this->sampleField();
+
+            forAll(nbrField.boundaryField(), patchI)
+            {
+                const fvPatchField<Type>& pf = nbrField.boundaryField()[patchI];
+                const Field<Type> pif(pf.patchInternalField());
+
+                label faceStart = pf.patch().start();
+
+                forAll(pf, faceI)
+                {
+                    allValues[faceStart++] = pif[faceI];
+                }
+            }
+
+            mpp.distribute(allValues);
+            nbrIntFld.transfer(allValues);
+
+            break;
+        }
+        default:
+        {
+            FatalErrorIn("mappedFixedValueFvPatchField<Type>::updateCoeffs()")
+                << "Unknown sampling mode: " << mpp.mode()
+                << abort(FatalError);
+        }
+    }
+
     // Restore tag
     UPstream::msgType() = oldTag;
 

src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.H

@@ -71,7 +71,10 @@ class mappedFixedValueFvPatchField
 :
     public fixedValueFvPatchField<Type>
 {
-    // Private data
+
+protected:
+
+    // Protected data
 
         //- Name of field to sample - defaults to field associated with this
         //  patchField if not specified
@@ -90,7 +93,7 @@ class mappedFixedValueFvPatchField
         mutable autoPtr<interpolation<Type> > interpolator_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- Field to sample. Either on my or nbr mesh
         const GeometricField<Type, fvPatchField, volMesh>& sampleField() const;

src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H

@@ -146,9 +146,9 @@ public:
     };
 
 
-private:
+protected:
 
-    // Private data
+    // Protected data
 
         //- Patch to sample
         const polyPatch& patch_;
@@ -199,7 +199,7 @@ private:
             dictionary surfDict_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- Collect single list of samples and originating processor+face.
         void collectSamples

src/parallel/decompose/ptscotchDecomp/Make/options

@@ -3,9 +3,10 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
+    -I$(SCOTCH_ROOT)/include \
     -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lrt
+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lrt

src/parallel/decompose/scotchDecomp/Make/options

@@ -7,9 +7,10 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
+    -I$(SCOTCH_ROOT)/include \
     -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt

src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.C

@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "nuSgsUSpaldingWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -47,8 +48,6 @@ nuSgsUSpaldingWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    UName_("U"),
-    nuName_("nu"),
     kappa_(0.41),
     E_(9.8)
 {}
@@ -64,8 +63,6 @@ nuSgsUSpaldingWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    nuName_(ptf.nuName_),
     kappa_(ptf.kappa_),
     E_(ptf.E_)
 {}
@@ -80,8 +77,6 @@ nuSgsUSpaldingWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8))
 {}
@@ -94,8 +89,6 @@ nuSgsUSpaldingWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(nwfpsf),
-    UName_(nwfpsf.UName_),
-    nuName_(nwfpsf.nuName_),
     kappa_(nwfpsf.kappa_),
     E_(nwfpsf.E_)
 {}
@@ -109,8 +102,6 @@ nuSgsUSpaldingWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(nwfpsf, iF),
-    UName_(nwfpsf.UName_),
-    nuName_(nwfpsf.nuName_),
     kappa_(nwfpsf.kappa_),
     E_(nwfpsf.E_)
 {}
@@ -123,16 +114,15 @@ void nuSgsUSpaldingWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
+    const LESModel& lesModel = db().lookupObject<LESModel>("LESProperties");
+    const label patchi = patch().index();
+    const fvPatchVectorField& U = lesModel.U().boundaryField()[patchi];
+    const scalarField nuw = lesModel.nu()().boundaryField()[patchi];
+
     const scalarField& ry = patch().deltaCoeffs();
 
-    const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-
     const scalarField magUp(mag(U.patchInternalField() - U));
 
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>(nuName_);
-
     scalarField& nuSgsw = *this;
 
     const scalarField magFaceGradU(mag(U.snGrad()));
@@ -185,8 +175,6 @@ void nuSgsUSpaldingWallFunctionFvPatchScalarField::evaluate
 void nuSgsUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "U", "U", UName_);
-    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
     os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
     os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
@@ -201,6 +189,7 @@ makePatchTypeField
     nuSgsUSpaldingWallFunctionFvPatchScalarField
 );
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels

src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsUSpaldingWallFunction/nuSgsUSpaldingWallFunctionFvPatchScalarField.H

@@ -58,12 +58,6 @@ class nuSgsUSpaldingWallFunctionFvPatchScalarField
 {
     // Private data
 
-        //- Name of velocity field
-        word UName_;
-
-        //- Name of laminar viscosity field
-        word nuName_;
-
         //- Von Karman constant
         scalar kappa_;
 

tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/extrudeToRegionMeshDict

@@ -20,6 +20,8 @@ faceZones       (fRight_zone fLeft_zone);
 
 oneD            true;
 
+sampleMode      nearestPatchFace;
+
 oneDPolyPatchType emptyPolyPatch; //wedgePolyPatch
 
 extrudeModel    linearNormal;

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/extrudeToRegionMeshDict

@@ -18,6 +18,8 @@ region          wallFilmRegion;
 
 faceZones       (wallFilmFaces);
 
+sampleMode      nearestPatchFace;
+
 oneD            false;
 
 extrudeModel    linearNormal;

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/extrudeToRegionMeshDict

@@ -24,6 +24,8 @@ faceZones
 
 oneD            false;
 
+sampleMode      nearestPatchFace;
+
 extrudeModel    linearNormal;
 
 nLayers         1;

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/extrudeToRegionMeshDict

@@ -20,6 +20,8 @@ faceZones       (wallFilmFaces);
 
 oneD            false;
 
+sampleMode      nearestPatchFace;
+
 extrudeModel    linearNormal;
 
 nLayers         1;

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/extrudeToRegionMeshDict

@@ -20,6 +20,8 @@ faceZones       (wallFilmFaces);
 
 oneD            false;
 
+sampleMode      nearestPatchFace;
+
 extrudeModel    linearNormal;
 
 nLayers         1;

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict

@@ -39,7 +39,9 @@ dynamicRefineFvMeshCoeffs
     // on surfaceScalarFields that do not need to be reinterpolated.
     correctFluxes
     (
-        (phi U)
+        (phi Urel)
+        (phiAbs U)
+        (phiAbs_0 U_0)
         (nHatf none)
         (rho*phi none)
         (ghf none)