From 227631742ddf8242e7e6022ad18bd7604d50aff0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 20 May 2010 08:42:07 +0200
Subject: [PATCH] ENH: add const-ness to pressureImplicitPorosity control
---
.../rhoPorousSimpleFoam/createFields.H | 23 ++++++-------------
.../porousSimpleFoam/createFields.H | 23 ++++++-------------
2 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index 09b75191db1..faa6108fb4d 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -65,22 +65,13 @@
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
thermalPorousZones pZones(mesh);
- Switch pressureImplicitPorosity(false);
+ // nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
- if (pZones.size())
- {
- // nUCorrectors for pressureImplicitPorosity
- if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
- {
- nUCorr = readInt
- (
- mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
- );
- }
+ const bool pressureImplicitPorosity =
+ (
+ pZones.size()
+ && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr)
+ && (nUCorr > 0)
+ );
- if (nUCorr > 0)
- {
- pressureImplicitPorosity = true;
- }
- }
diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
index 6861ae0005e..7ce03c19672 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
@@ -43,22 +43,13 @@
porousZones pZones(mesh);
- Switch pressureImplicitPorosity(false);
+ // nUCorrectors used for pressureImplicitPorosity
int nUCorr = 0;
- if (pZones.size())
- {
- // nUCorrectors for pressureImplicitPorosity
- if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
- {
- nUCorr = readInt
- (
- mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
- );
- }
+ const bool pressureImplicitPorosity =
+ (
+ pZones.size()
+ && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr)
+ && (nUCorr > 0)
+ );
- if (nUCorr > 0)
- {
- pressureImplicitPorosity = true;
- }
- }
--
GitLab