From d7f3143a91b4df43f35e06e88b12cca79bb9f353 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 23 Jul 2009 12:37:12 +0100 Subject: [PATCH] Revert "bugfix for extra RASModel::yPlus() parameters" This reverts commit 82e59fa1120bff5090efbc29fc9f83722881fd0d. --- .../postProcessing/wall/yPlusRAS/yPlusRAS.C | 15 ++++++--------- .../compressible/RAS/RASModel/RASModel.C | 3 +-- .../incompressible/RAS/RASModel/RASModel.C | 3 +-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C index 9653f0431f..a93712263e 100644 --- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C +++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C @@ -94,26 +94,23 @@ int main(int argc, char *argv[]) singlePhaseTransportModel laminarTransport(U, phi); - autoPtr rasModel + autoPtr RASModel ( incompressible::RASModel::New(U, phi, laminarTransport) ); - const scalar Cmu = - rasModel->coeffDict().lookupOrDefault("Cmu", 0.09); - const fvPatchList& patches = mesh.boundary(); - forAll(patches, patchI) + forAll(patches, patchi) { - const fvPatch& currPatch = patches[patchI]; + const fvPatch& currPatch = patches[patchi]; if (typeid(currPatch) == typeid(wallFvPatch)) { - yPlus.boundaryField()[patchI] = rasModel->yPlus(patchI, Cmu); - const scalarField& Yp = yPlus.boundaryField()[patchI]; + yPlus.boundaryField()[patchi] = RASModel->yPlus(patchi); + const scalarField& Yp = yPlus.boundaryField()[patchi]; - Info<< "Patch " << patchI + Info<< "Patch " << patchi << " named " << currPatch.name() << " y+ : min: " << min(Yp) << " max: " << max(Yp) << " average: " << average(Yp) << nl << endl; diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 087a1b578a..8d18cec8c5 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -184,8 +184,7 @@ tmp RASModel::yPlus(const label patchNo, const scalar Cmu) const { WarningIn ( - "tmp RASModel::yPlus" - "(const label patchNo, const scalar Cmu) const" + "tmp RASModel::yPlus(const label patchNo) const" ) << "Patch " << patchNo << " is not a wall. Returning null field" << nl << endl; diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index e17dde609d..6b300390c9 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -176,8 +176,7 @@ tmp RASModel::yPlus(const label patchNo, const scalar Cmu) const { WarningIn ( - "tmp RASModel::yPlus" - "(const label patchNo, const scalar Cmu) const" + "tmp RASModel::yPlus(const label patchNo) const" ) << "Patch " << patchNo << " is not a wall. Returning null field" << nl << endl;