diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H index 2fde518a6c10a6c55addf6d5bba10c22bf72d532..03b258042529f3e90c6ca942fdd946f094d78214 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H +++ b/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) ); diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C index 46966e37d677b588202073d65a8420abcaf1d9fd..abb2e365653139dc1946ec77e6306fe0d279bf4d 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTableTemplates.C +++ b/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 ( diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C index bbce1c49d293d35a7a13678f08fff29c7917a931..4801ac1a991ac4fa113f6fcaa8964b44c0bd9423 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C +++ b/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)); diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C index a705c370967266f3bd348db18b3fd10bc7cc8085..79f3713d3e218d0ba2781f212ef9112814985943 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C +++ b/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 diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C index fb168c8813b5834bea7d8bf4c5f277d4101369a0..b462678e39fb5fba374c31e21448b43be4b3a135 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C +++ b/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 diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C index 50cdb1460b0935750e22003b1cd10f4a7ee759b1..b80b809cd7a30f33ce3231b52943139335f81f33 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C +++ b/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 diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 6b95d77d03ab57d128de16b8f988056c57e0d2f7..7f4fd76c734cd27f20513464e36658dcd3a51e5d 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/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;