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

Conflicts:
	src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H

@@ -5,8 +5,8 @@
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turb.alphaEff(), h)
      ==
-        fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)")
-      - (rho/psi)*fvc::div(phi/fvc::interpolate(rho))
+        fvc::div(phi/fvc::interpolate(rho), p, "div(U,p)")
+      - p*fvc::div(phi/fvc::interpolate(rho))
       + rad.Sh(thermo)
     );
 

src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C

@@ -57,7 +57,17 @@ bool Foam::dlLibraryTable::open
             bool opened = dlLibraryTable::open(libName);
             allOpened = opened && allOpened;
 
-            if (opened && (!tablePtr || tablePtr->size() <= nEntries))
+            if (!opened)
+            {
+                WarningIn
+                (
+                    "dlLibraryTable::open"
+                    "(const dictionary&, const word&, "
+                    "const TablePtr&)"
+                )   << "Could not open library " << libName
+                    << endl << endl;
+            }
+            else if (debug && (!tablePtr || tablePtr->size() <= nEntries))
             {
                 WarningIn
                 (

src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C

@@ -109,10 +109,6 @@ void Foam::LISA::atomizeParcel
     scalar rhoFuel = fuels.rho(1.0e+5, p.T(), p.X());
     scalar nuFuel = muFuel/rhoFuel;
 
-    vector uDir = p.U()/mag(p.U());
-
-    scalar uGas = mag(vel & uDir);
-
     // Might be the relative velocity between Liquid and Gas, but using the
     // absolute velocity of the parcel as suggested by the authors
     // scalar U = mag(p.Urel(vel));

src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C

@@ -154,9 +154,6 @@ bool Foam::SHF<CloudType>::update
     scalar reLiquid   = 0.5*Urmag*d/mu;
     scalar ohnesorge  = sqrt(weLiquid)/(reLiquid + VSMALL);
 
-    vector acceleration = Urel/tMom;
-    vector trajectory = U/mag(U);
-
     scalar weGasCorr = weGas/(1.0 + weCorrCoeff_*ohnesorge);
 
     // droplet deformation characteristic time

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C

@@ -85,7 +85,6 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
     vector refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 1, 0);
 
     vector oldDir = refQ_ & refDir;
-
     vector newDir = motion.orientation() & refDir;
 
     if (mag(oldDir & axis_) > 0.95 || mag(newDir & axis_) > 0.95)
@@ -93,10 +92,8 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
         // Directions getting close to the axis, change reference
 
         refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
-
-        vector oldDir = refQ_ & refDir;
-
-        vector newDir = motion.orientation() & refDir;
+        oldDir = refQ_ & refDir;
+        newDir = motion.orientation() & refDir;
     }
 
     // Removing any axis component from oldDir and newDir and normalising

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C

@@ -95,10 +95,8 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
         // Directions getting close to the axis, change reference
 
         refDir = rotationTensor(vector(1, 0 ,0), axis_) & vector(0, 0, 1);
-
-        vector oldDir = refQ_ & refDir;
-
-        vector newDir = motion.orientation() & refDir;
+        oldDir = refQ_ & refDir;
+        newDir = motion.orientation() & refDir;
     }
 
     // Removing any axis component from oldDir and newDir and normalising

src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C

@@ -457,7 +457,7 @@ scalar reactingOneDim::addMassSources(const label patchI, const label faceI)
 scalar reactingOneDim::solidRegionDiffNo() const
 {
     scalar DiNum = 0.0;
-    scalar meanDiNum = 0.0;
+
     if (regionMesh().nInternalFaces() > 0)
     {
         surfaceScalarField KrhoCpbyDelta
@@ -468,8 +468,6 @@ scalar reactingOneDim::solidRegionDiffNo() const
         );
 
         DiNum = max(KrhoCpbyDelta.internalField())*time_.deltaTValue();
-
-        meanDiNum = average(KrhoCpbyDelta.internalField())*time().deltaTValue();
     }
 
     return DiNum;