diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index d913f7bf090e55008addf177978f3434c4074b15..264f141cd201dcdc08b1239ea23f2358291b5be0 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -40,7 +40,7 @@ Description The input from viewFactorsDict are: - tolGaussQuad 0.1; // GaussQuad error + GaussQuadTol 0.1; // GaussQuad error distTol 8; // R/Average(rm) alpha 0.22; // Use for common edges for 2LI @@ -80,7 +80,6 @@ Description #include "indirectPrimitivePatch.H" #include "DynamicField.H" -//#include "unitConversion.H" #include "scalarMatrices.H" #include "labelListIOList.H" @@ -442,8 +441,8 @@ int main(int argc, char *argv[]) const label debug = viewFactorDict.getOrDefault<label>("debug", 0); - const scalar tolGaussQuad = - viewFactorDict.getOrDefault<scalar>("tolGaussQuad", 0.01); + const scalar GaussQuadTol = + viewFactorDict.getOrDefault<scalar>("GaussQuadTol", 0.01); const scalar distTol = viewFactorDict.getOrDefault<scalar>("distTol", 8); @@ -1050,7 +1049,7 @@ int main(int argc, char *argv[]) if ( - (mag(err) < tolGaussQuad && gi > 0) + (mag(err) < GaussQuadTol && gi > 0) || gi == maxQuadOrder-1 ) { diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C index 4d8dfb3c8706c3363f305babb521ea9514d794c9..3c811ef202359b807055c98f1f27f1bf96f79006 100644 --- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C +++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C @@ -219,7 +219,7 @@ void Foam::radiation::viewFactor::initialise() labelList upper(rays_.size(), -1); labelList lower(rays_.size(), -1); - const edgeList& raysLst = rays_.sortedToc(); + const edgeList raysLst(rays_.sortedToc()); label rayI = 0; for (const auto& e : raysLst) { @@ -441,8 +441,8 @@ void Foam::radiation::viewFactor::initialise() totalDelta /= myF.size(); reduce(totalDelta, sumOp<scalar>()); reduce(maxDelta, maxOp<scalar>()); - Info << "Smoothng average delta : " << totalDelta << endl; - Info << "Smoothng maximum delta : " << maxDelta << nl << endl; + Info << "Smoothing average delta : " << totalDelta << endl; + Info << "Smoothing maximum delta : " << maxDelta << nl << endl; } } @@ -853,7 +853,7 @@ void Foam::radiation::viewFactor::calculate() // Local matrix coefficients if (!constEmissivity_ || iterCounter_ == 0) { - const edgeList& raysLst = rays_.sortedToc(); + const edgeList raysLst(rays_.sortedToc()); label rayI = 0; for (const auto& e : raysLst)