From 7132f1380fa414fa2450f759766e6ce5b62e1093 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Feb 2015 21:43:40 +0000
Subject: [PATCH] Compressible solvers: rhoMax and rhoMin now optional and may
be supplied without dimensions
---
.../compressible/rhoPimpleFoam/createFields.H | 23 ++++++++++++++++--
.../compressible/rhoSimpleFoam/createFields.H | 23 ++++++++++++++++--
.../rhoPorousSimpleFoam/createFields.H | 23 ++++++++++++++++--
.../reactingParcelFoam/createFields.H | 22 ++++++++++-------
.../simpleReactingParcelFoam/createFields.H | 24 +++++++++++++++++--
.../lagrangian/sprayFoam/createFields.H | 24 ++++++++++++++++++-
6 files changed, 122 insertions(+), 17 deletions(-)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 67cc0c3e456..fc82f631d03 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 dea35b76575..fd303612c6b 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 4fff74d224c..ced5e478bf1 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 731d3e401f7..4dc0b1cfb9f 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 d6df24cb48d..7f84d791a7c 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 4aa21b506fb..c2d4ae7f0f7 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
(
--
GitLab