From af70485f4b10569b34faf74aa2be8d25bd07d2fc Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 16 Jul 2015 09:33:47 +0100 Subject: [PATCH] Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.4.x --- .../filmViscosityModel/constantViscosity/constantViscosity.C | 2 +- .../filmViscosityModel/constantViscosity/constantViscosity.H | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C index acff066c..937c1719 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C @@ -56,7 +56,7 @@ constantViscosity::constantViscosity ) : filmViscosityModel(typeName, owner, dict, mu), - mu0_(readScalar(coeffDict_.lookup("mu0"))) + mu0_("mu0", dimDensity*dimViscosity, coeffDict_.lookup("mu0")) { mu_ == mu0_; } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H index 87432ca2..449cff19 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H @@ -54,8 +54,6 @@ class constantViscosity : public filmViscosityModel { -private: - // Private member functions //- Disallow default bitwise copy construct @@ -70,7 +68,7 @@ protected: // Protected data //- Constant viscosity [Pa.s] - scalar mu0_; + dimensionedScalar mu0_;