From 2357b2cd9109364fe038f5b9fab24d7285e889f2 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 20 Jan 2014 12:15:34 +0000 Subject: [PATCH] ENH: Cloud function objects - updated output folder --- .../CloudFunctionObject/CloudFunctionObject.C | 12 ++++++++++-- .../CloudFunctionObject/CloudFunctionObject.H | 5 ++++- .../FacePostProcessing/FacePostProcessing.C | 10 +++++----- .../ParticleCollector/ParticleCollector.C | 10 +++++----- .../PatchPostProcessing/PatchPostProcessing.C | 8 +++----- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C index 199023cfc5..e67b0b938c 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,8 @@ Foam::CloudFunctionObject::CloudFunctionObject const CloudFunctionObject& ppm ) : - CloudSubModelBase(ppm) + CloudSubModelBase(ppm), + outputDir_(ppm.outputDir_) {} @@ -156,6 +157,13 @@ const Foam::fileName& Foam::CloudFunctionObject::outputDir() const } +template +Foam::fileName Foam::CloudFunctionObject::outputTimeDir() const +{ + return outputDir_/this->owner().time().timeName(); +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #include "CloudFunctionObjectNew.C" diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H index 90996706fb..4fe6798676 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -174,6 +174,9 @@ public: //- Return the output path const fileName& outputDir() const; + + //- Return the output time path + fileName outputTimeDir() const; }; diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C index b123e38291..cf67435f10 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ void Foam::FacePostProcessing::makeLogFile if (Pstream::master()) { // Create directory if does not exist - mkDir(this->outputDir()); + mkDir(this->outputTimeDir()); // Open new file at start up outputFilePtr_.set @@ -59,7 +59,7 @@ void Foam::FacePostProcessing::makeLogFile zoneI, new OFstream ( - this->outputDir()/(type() + '_' + zoneName + ".dat") + this->outputTimeDir()/(type() + '_' + zoneName + ".dat") ) ); @@ -202,7 +202,7 @@ void Foam::FacePostProcessing::write() writer->write ( - this->outputDir()/time.timeName(), + this->outputTimeDir(), fZone.name(), allPoints, allFaces, @@ -213,7 +213,7 @@ void Foam::FacePostProcessing::write() writer->write ( - this->outputDir()/time.timeName(), + this->outputTimeDir(), fZone.name(), allPoints, allFaces, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 28fc229c2d..745ec1a047 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,12 +52,12 @@ void Foam::ParticleCollector::makeLogFile if (Pstream::master()) { // Create directory if does not exist - mkDir(this->outputDir()); + mkDir(this->outputTimeDir()); // Open new file at start up outputFilePtr_.reset ( - new OFstream(this->outputDir()/(type() + ".dat")) + new OFstream(this->outputTimeDir()/(type() + ".dat")) ); outputFilePtr_() @@ -461,7 +461,7 @@ void Foam::ParticleCollector::write() writer->write ( - this->outputDir()/time.timeName(), + this->outputTimeDir(), "collector", points_, faces_, @@ -472,7 +472,7 @@ void Foam::ParticleCollector::write() writer->write ( - this->outputDir()/time.timeName(), + this->outputTimeDir(), "collector", points_, faces_, diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C index 67d65a7175..dc60b4206e 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,16 +68,14 @@ void Foam::PatchPostProcessing::write() { const fvMesh& mesh = this->owner().mesh(); - fileName outputDir = this->outputDir()/mesh.time().timeName(); - // Create directory if it doesn't exist - mkDir(outputDir); + mkDir(this->outputTimeDir()); const word& patchName = mesh.boundaryMesh()[patchIDs_[i]].name(); OFstream patchOutFile ( - outputDir/patchName + ".post", + this->outputTimeDir()/patchName + ".post", IOstream::ASCII, IOstream::currentVersion, mesh.time().writeCompression()