From 47a746b2c1a7fbb2292d986b7ffb1caa9614be89 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 16 Oct 2012 10:47:21 +0100 Subject: [PATCH] ENH: Updates to function objects --- .../regionSizeDistribution.C | 20 ++++--------------- .../forces/forceCoeffs/forceCoeffs.C | 3 +-- .../functionObjects/forces/forces/forces.C | 2 +- .../wallShearStress/wallShearStress.C | 13 +++++++----- .../utilities/yPlusLES/yPlusLES.C | 20 +++++++++---------- .../utilities/yPlusRAS/yPlusRAS.C | 12 +++++------ 6 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C index 66cbea4120..3e5e2fc98a 100644 --- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C +++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C @@ -65,25 +65,13 @@ void Foam::regionSizeDistribution::writeGraph const scalarField& values ) const { - const fvMesh& mesh = refCast(obr_); - const wordList valNames(1, valueName); - fileName outputPath = baseFileDir()/name_; - - if (mesh.name() != fvMesh::defaultRegion) - { - outputPath = outputPath/mesh.name(); - } - - outputPath = outputPath/mesh.time().timeName(); - + fileName outputPath = baseTimeDir(); mkDir(outputPath); - OFstream str - ( - outputPath - / formatterPtr_().getFileName(coords, valNames) - ); + + OFstream str(outputPath/formatterPtr_().getFileName(coords, valNames)); + Info<< "Writing distribution of " << valueName << " to " << str.name() << endl; diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C index dd7829f81e..1487175753 100644 --- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C +++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C @@ -166,8 +166,7 @@ void Foam::forceCoeffs::write() mag(binPoints_) ); - fileName forcesDir = - baseFileDir()/name_/obr_.time().timeName(); + fileName forcesDir = baseTimeDir(); mkDir(forcesDir); if (log_) diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C index 28df2ad0b8..bfcd001eab 100644 --- a/src/postProcessing/functionObjects/forces/forces/forces.C +++ b/src/postProcessing/functionObjects/forces/forces/forces.C @@ -228,7 +228,7 @@ void Foam::forces::writeBins() const autoPtr > binWriterPtr(writer::New(binFormat_)); coordSet axis("forces", "distance", binPoints_, mag(binPoints_)); - fileName forcesDir = baseFileDir()/name_/obr_.time().timeName(); + fileName forcesDir = baseTimeDir(); mkDir(forcesDir); if (log_) diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C index 9803f154ef..a7e5e1ee09 100644 --- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C +++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C @@ -66,12 +66,15 @@ void Foam::wallShearStress::calcShearStress ssp = (-Sfp/magSfp) & Reffp; - vector minSsp = min(ssp); - vector maxSsp = max(ssp); + vector minSsp = gMin(ssp); + vector maxSsp = gMax(ssp); - file() << mesh.time().timeName() << token::TAB - << pp.name() << token::TAB << minSsp - << token::TAB << maxSsp << endl; + if (Pstream::master()) + { + file() << mesh.time().timeName() << token::TAB + << pp.name() << token::TAB << minSsp + << token::TAB << maxSsp << endl; + } if (log_) { diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C index e02c1957b3..d7543ff1b5 100644 --- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C +++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C @@ -84,15 +84,15 @@ void Foam::yPlusLES::calcIncompressibleYPlus const scalarField& Yp = yPlus.boundaryField()[patchI]; - scalar minYp = min(Yp); - scalar maxYp = max(Yp); - scalar avgYp = average(Yp); + scalar minYp = gMin(Yp); + scalar maxYp = gMax(Yp); + scalar avgYp = gAverage(Yp); if (log_) { Info<< " patch " << currPatch.name() - << " y+ : min = " << min(Yp) << ", max = " << max(Yp) - << ", average = " << average(Yp) << nl; + << " y+ : min = " << minYp << ", max = " << maxYp + << ", average = " << avgYp << nl; } if (Pstream::master()) @@ -150,15 +150,15 @@ void Foam::yPlusLES::calcCompressibleYPlus const scalarField& Yp = yPlus.boundaryField()[patchI]; - scalar minYp = min(Yp); - scalar maxYp = max(Yp); - scalar avgYp = average(Yp); + scalar minYp = gMin(Yp); + scalar maxYp = gMax(Yp); + scalar avgYp = gAverage(Yp); if (log_) { Info<< " patch " << currPatch.name() - << " y+ : min = " << min(Yp) << ", max = " << max(Yp) - << ", average = " << average(Yp) << nl; + << " y+ : min = " << minYp << ", max = " << maxYp + << ", average = " << avgYp << nl; } if (Pstream::master()) diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C index 8d7a46f67c..8d81c05bfe 100644 --- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C +++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C @@ -79,9 +79,9 @@ void Foam::yPlusRAS::calcIncompressibleYPlus yPlus.boundaryField()[patchI] = nutPw.yPlus(); const scalarField& Yp = yPlus.boundaryField()[patchI]; - scalar minYp = min(Yp); - scalar maxYp = max(Yp); - scalar avgYp = average(Yp); + scalar minYp = gMin(Yp); + scalar maxYp = gMax(Yp); + scalar avgYp = gAverage(Yp); if (log_) { @@ -137,9 +137,9 @@ void Foam::yPlusRAS::calcCompressibleYPlus yPlus.boundaryField()[patchI] = mutPw.yPlus(); const scalarField& Yp = yPlus.boundaryField()[patchI]; - scalar minYp = min(Yp); - scalar maxYp = max(Yp); - scalar avgYp = average(Yp); + scalar minYp = gMin(Yp); + scalar maxYp = gMax(Yp); + scalar avgYp = gAverage(Yp); if (log_) {