From a479a295716fd6216c47e9606a77e8018c1e20b4 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 20 Dec 2011 10:25:49 +0000
Subject: [PATCH] BUG: Corrected reference to tmp in incompressible RAS models
(mantis #360)
---
.../kappatJayatillekeWallFunctionFvPatchScalarField.C | 4 +++-
.../nutURoughWallFunctionFvPatchScalarField.C | 8 ++++++--
.../nutUSpaldingWallFunctionFvPatchScalarField.C | 8 ++++++--
.../nutUTabulatedWallFunctionFvPatchScalarField.C | 8 ++++++--
.../nutUWallFunction/nutUWallFunctionFvPatchScalarField.C | 8 ++++++--
.../nutkRoughWallFunctionFvPatchScalarField.C | 4 +++-
.../nutkWallFunction/nutkWallFunctionFvPatchScalarField.C | 8 ++++++--
7 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C
index 96bc3586211..917c65ca5f0 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kappatWallFunctions/kappatJayatillekeWallFunction/kappatJayatillekeWallFunctionFvPatchScalarField.C
@@ -207,7 +207,9 @@ void kappatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu25 = pow(Cmu_, 0.25);
const scalarField& y = rasModel.y()[patchI];
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
const tmp<volScalarField> tk = rasModel.k();
const volScalarField& k = tk();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index 51dabb01fd0..41f7c926d32 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -47,7 +47,9 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcNut() const
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField& y = rasModel.y()[patchI];
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
// The flow velocity at the adjacent cell centre
const scalarField magUp(mag(Uw.patchInternalField() - Uw));
@@ -80,7 +82,9 @@ tmp<scalarField> nutURoughWallFunctionFvPatchScalarField::calcYPlus
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField& y = rasModel.y()[patchI];
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
scalarField& yPlus = tyPlus();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
index 37b641ebcd5..93b6376601b 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C
@@ -47,7 +47,9 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField magGradU(mag(Uw.snGrad()));
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
return max
(
@@ -181,7 +183,9 @@ tmp<scalarField> nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField& y = rasModel.y()[patchI];
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
return y*calcUTau(mag(Uw.snGrad()))/nuw;
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index 2ed3f35c95f..4bb2c1ea195 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -49,7 +49,9 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::calcNut() const
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField magUp(mag(Uw.patchInternalField() - Uw));
const scalarField magGradU(mag(Uw.snGrad()));
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
return
max
@@ -182,7 +184,9 @@ tmp<scalarField> nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const
const scalarField& y = rasModel.y()[patchI];
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField magUp(mag(Uw.patchInternalField() - Uw));
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
const scalarField Rey(magUp*y/nuw);
return Rey/(calcUPlus(Rey) + ROOTVSMALL);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
index ce150094c84..77fc20e46a0 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C
@@ -47,7 +47,9 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
const scalarField magUp(mag(Uw.patchInternalField() - Uw));
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
tmp<scalarField> tyPlus = calcYPlus(magUp);
scalarField& yPlus = tyPlus();
@@ -77,7 +79,9 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcYPlus
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalarField& y = rasModel.y()[patchI];
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
scalarField& yPlus = tyPlus();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
index 893c3aa9770..9dc82a03ad2 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C
@@ -71,7 +71,9 @@ tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
const scalarField& y = rasModel.y()[patchI];
const tmp<volScalarField> tk = rasModel.k();
const volScalarField& k = tk();
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
const scalar Cmu25 = pow025(Cmu_);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
index 8b7ed5cded4..157b88731a5 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -80,7 +80,9 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
const scalarField& y = rasModel.y()[patchI];
const tmp<volScalarField> tk = rasModel.k();
const volScalarField& k = tk();
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
const scalar Cmu25 = pow025(Cmu_);
@@ -220,7 +222,9 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
const tmp<volScalarField> tk = rasModel.k();
const volScalarField& k = tk();
tmp<scalarField> kwc = k.boundaryField()[patchI].patchInternalField();
- const scalarField& nuw = rasModel.nu()().boundaryField()[patchI];
+ const tmp<volScalarField> tnu = rasModel.nu();
+ const volScalarField& nu = tnu();
+ const scalarField& nuw = nu.boundaryField()[patchI];
return pow025(Cmu_)*y*sqrt(kwc)/nuw;
}
--
GitLab