diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 67cc0c3e456573e71fe9f4937a5fd5d3e9253692..fc82f631d0316b7fc28184348e32a5b33cf38342 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -39,8 +39,27 @@ #include "compressibleCreatePhi.H" - dimensionedScalar rhoMax(pimple.dict().lookup("rhoMax")); - dimensionedScalar rhoMin(pimple.dict().lookup("rhoMin")); + dimensionedScalar rhoMax + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + pimple.dict(), + GREAT, + dimDensity + ) + ); + + dimensionedScalar rhoMin + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + pimple.dict(), + 0, + dimDensity + ) + ); Info<< "Creating turbulence model\n" << endl; autoPtr<compressible::turbulenceModel> turbulence diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H index dea35b76575477e953c521d77f6bb12cf28c3dc0..fd303612c6b4201da243008dffe3e464dafb30dc 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H @@ -44,8 +44,27 @@ scalar pRefValue = 0.0; setRefCell(p, simple.dict(), pRefCell, pRefValue); - dimensionedScalar rhoMax(simple.dict().lookup("rhoMax")); - dimensionedScalar rhoMin(simple.dict().lookup("rhoMin")); + dimensionedScalar rhoMax + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + simple.dict(), + GREAT, + dimDensity + ) + ); + + dimensionedScalar rhoMin + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + simple.dict(), + 0, + dimDensity + ) + ); Info<< "Creating turbulence model\n" << endl; autoPtr<compressible::RASModel> turbulence diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H index 4fff74d224cadb920dec4f6c42b936dff55f0452..ced5e478bf1b3f232fdd21f0abca71f21c294a66 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H @@ -43,8 +43,27 @@ scalar pRefValue = 0.0; setRefCell(p, simple.dict(), pRefCell, pRefValue); - dimensionedScalar rhoMax(simple.dict().lookup("rhoMax")); - dimensionedScalar rhoMin(simple.dict().lookup("rhoMin")); + dimensionedScalar rhoMax + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + simple.dict(), + GREAT, + dimDensity + ) + ); + + dimensionedScalar rhoMin + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + simple.dict(), + 0, + dimDensity + ) + ); Info<< "Creating turbulence model\n" << endl; autoPtr<compressible::RASModel> turbulence diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 731d3e401f7b2184dc59342249f4f86dd1f3e521..4dc0b1cfb9fda8557f0fd5fa0f297f11898b5cce 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -58,18 +58,24 @@ dimensionedScalar rhoMax ( - "rhoMax", - dimDensity, - pimple.dict() - .lookupOrDefault<scalar>("rhoMax", GREAT) + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + pimple.dict(), + GREAT, + dimDensity + ) ); dimensionedScalar rhoMin ( - "rhoMin", - dimDensity, - pimple.dict() - .lookupOrDefault<scalar>("rhoMin", -GREAT) + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + pimple.dict(), + 0, + dimDensity + ) ); Info<< "Creating turbulence model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index d6df24cb48db47b198ce034055c0a656b0bac387..7f84d791a7c930cd89b533df890d5d309aaaf716 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -56,8 +56,28 @@ #include "compressibleCreatePhi.H" - dimensionedScalar rhoMax(simple.dict().lookup("rhoMax")); - dimensionedScalar rhoMin(simple.dict().lookup("rhoMin")); + + dimensionedScalar rhoMax + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + simple.dict(), + GREAT, + dimDensity + ) + ); + + dimensionedScalar rhoMin + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + simple.dict(), + 0, + dimDensity + ) + ); Info<< "Creating turbulence model\n" << endl; autoPtr<compressible::turbulenceModel> turbulence diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 4aa21b506fbbb0e7eb8d8d07fe55aa966389d86e..c2d4ae7f0f7420aae3480abe19181422fa67893f 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -34,7 +34,7 @@ "rho", runTime.timeName(), mesh, - IOobject::NO_READ, + IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), thermo.rho() @@ -56,6 +56,28 @@ #include "compressibleCreatePhi.H" + dimensionedScalar rhoMax + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMax", + pimple.dict(), + GREAT, + dimDensity + ) + ); + + dimensionedScalar rhoMin + ( + dimensionedScalar::lookupOrDefault + ( + "rhoMin", + pimple.dict(), + 0, + dimDensity + ) + ); + Info<< "Creating turbulence model\n" << endl; autoPtr<compressible::turbulenceModel> turbulence (