diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index b3ddd44ff2..1e0ec17021 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C @@ -123,13 +123,13 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf ) ); - volScalarField& muf_ = tmuf(); + volScalarField& muff = tmuf(); forAll (D, celli) { if (alpha[celli] > alphaMax.value()-5e-2) { - muf_[celli] = + muff[celli] = 0.5*pf[celli]*sin(phi.value()) /( sqrt(1.0/6.0*(sqr(D[celli].xx() - D[celli].yy()) @@ -141,7 +141,7 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf } } - return muf_; + return tmuf; } diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C old mode 100755 new mode 100644 diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H old mode 100755 new mode 100644 diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C old mode 100755 new mode 100644 index 0155aaca31..a735465a93 --- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C +++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C @@ -51,9 +51,23 @@ namespace viscosityModels Foam::tmp Foam::viscosityModels::powerLaw::calcNu() const { - dimensionedScalar tone("tone", dimTime, 1.0); - return (max(numin_, min(numax_, k_ - * pow(tone * strainRate(), n_.value()- scalar(1.0))))); + return max + ( + nuMin_, + min + ( + nuMax_, + k_*pow + ( + max + ( + dimensionedScalar("one", dimTime, 1.0)*strainRate(), + dimensionedScalar("VSMALL", dimless, VSMALL) + ), + n_.value() - scalar(1.0) + ) + ) + ); } @@ -71,8 +85,8 @@ Foam::viscosityModels::powerLaw::powerLaw powerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")), k_(powerLawCoeffs_.lookup("k")), n_(powerLawCoeffs_.lookup("n")), - numin_(powerLawCoeffs_.lookup("numin")), - numax_(powerLawCoeffs_.lookup("numax")), + nuMin_(powerLawCoeffs_.lookup("nuMin")), + nuMax_(powerLawCoeffs_.lookup("nuMax")), nu_ ( IOobject @@ -101,8 +115,8 @@ bool Foam::viscosityModels::powerLaw::read powerLawCoeffs_.lookup("k") >> k_; powerLawCoeffs_.lookup("n") >> n_; - powerLawCoeffs_.lookup("numin") >> numin_; - powerLawCoeffs_.lookup("numax") >> numax_; + powerLawCoeffs_.lookup("nuMin") >> nuMin_; + powerLawCoeffs_.lookup("nuMax") >> nuMax_; return true; } diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H old mode 100755 new mode 100644 index 10a49fc8c4..f32fb749be --- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H +++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H @@ -61,8 +61,8 @@ class powerLaw dimensionedScalar k_; dimensionedScalar n_; - dimensionedScalar numin_; - dimensionedScalar numax_; + dimensionedScalar nuMin_; + dimensionedScalar nuMax_; volScalarField nu_;