From ed2ba8e1f7a96ec486aa72292541f0a93a6a00c3 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 3 Jun 2009 12:41:11 +0100 Subject: [PATCH] Re-factored StandardPostProcessing -> PatchPostProcessing --- .../makeReactingParcelPostProcessingModels.H | 4 ++-- ...BasicKinematicParcelPostProcessingModels.C | 4 ++-- ...akeBasicThermoParcelPostProcessingModels.C | 4 ++-- .../PatchPostProcessing.C} | 14 ++++++------ .../PatchPostProcessing.H} | 22 +++++++++---------- .../PatchPostProcessingI.H} | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) rename src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/{StandardPostProcessing/StandardPostProcessing.C => PatchPostProcessing/PatchPostProcessing.C} (89%) rename src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/{StandardPostProcessing/StandardPostProcessing.H => PatchPostProcessing/PatchPostProcessing.H} (87%) rename src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/{StandardPostProcessing/StandardPostProcessingI.H => PatchPostProcessing/PatchPostProcessingI.H} (91%) diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/submodels/makeReactingParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/submodels/makeReactingParcelPostProcessingModels.H index b4f3b8e56f..588e643a5b 100644 --- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/submodels/makeReactingParcelPostProcessingModels.H +++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/submodels/makeReactingParcelPostProcessingModels.H @@ -33,7 +33,7 @@ License #include "KinematicCloud.H" #include "NoPostProcessing.H" -#include "StandardPostProcessing.H" +#include "PatchPostProcessing.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,7 +65,7 @@ License ); \ makePostProcessingModelThermoType \ ( \ - StandardPostProcessing, \ + PatchPostProcessing, \ KinematicCloud, \ ParcelType, \ ThermoType \ diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelPostProcessingModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelPostProcessingModels.C index 3b4020dfd8..9d48510f13 100644 --- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelPostProcessingModels.C +++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelPostProcessingModels.C @@ -28,7 +28,7 @@ License #include "KinematicCloud.H" #include "NoPostProcessing.H" -#include "StandardPostProcessing.H" +#include "PatchPostProcessing.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,7 +45,7 @@ namespace Foam ); makePostProcessingModelType ( - StandardPostProcessing, + PatchPostProcessing, KinematicCloud, basicKinematicParcel ); diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelPostProcessingModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelPostProcessingModels.C index 0188638767..6555434039 100644 --- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelPostProcessingModels.C +++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelPostProcessingModels.C @@ -27,7 +27,7 @@ License #include "basicThermoParcel.H" #include "KinematicCloud.H" #include "NoPostProcessing.H" -#include "StandardPostProcessing.H" +#include "PatchPostProcessing.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,7 +44,7 @@ namespace Foam ); makePostProcessingModelType ( - StandardPostProcessing, + PatchPostProcessing, KinematicCloud, basicThermoParcel ); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C similarity index 89% rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.C rename to src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C index c3e2a80f3e..5c01e9b488 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C @@ -24,13 +24,13 @@ License \*---------------------------------------------------------------------------*/ -#include "StandardPostProcessing.H" +#include "PatchPostProcessing.H" #include "IOPtrList.H" // * * * * * * * * * * * * * protected Member Functions * * * * * * * * * * // template -void Foam::StandardPostProcessing::write() +void Foam::PatchPostProcessing::write() { forAll(patchData_, patchI) { @@ -70,7 +70,7 @@ void Foam::StandardPostProcessing::write() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::StandardPostProcessing::StandardPostProcessing +Foam::PatchPostProcessing::PatchPostProcessing ( const dictionary& dict, CloudType& owner @@ -88,7 +88,7 @@ Foam::StandardPostProcessing::StandardPostProcessing { FatalErrorIn ( - "StandardPostProcessing::StandardPostProcessing" + "PatchPostProcessing::PatchPostProcessing" "(" "const dictionary&, " "CloudType& owner" @@ -104,21 +104,21 @@ Foam::StandardPostProcessing::StandardPostProcessing // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::StandardPostProcessing::~StandardPostProcessing() +Foam::PatchPostProcessing::~PatchPostProcessing() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -bool Foam::StandardPostProcessing::active() const +bool Foam::PatchPostProcessing::active() const { return true; } template -void Foam::StandardPostProcessing::postPatch +void Foam::PatchPostProcessing::postPatch ( const parcelType& p, const label patchI diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H similarity index 87% rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.H rename to src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H index deb17b7ef6..9f5dc85096 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessing.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H @@ -23,18 +23,18 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::StandardPostProcessing + Foam::PatchPostProcessing Description Standard post-processing SourceFiles - StandardPostProcessing.C + PatchPostProcessing.C \*---------------------------------------------------------------------------*/ -#ifndef StandardPostProcessing_H -#define StandardPostProcessing_H +#ifndef PatchPostProcessing_H +#define PatchPostProcessing_H #include "PostProcessingModel.H" @@ -44,11 +44,11 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class StandardPostProcessing Declaration + Class PatchPostProcessing Declaration \*---------------------------------------------------------------------------*/ template -class StandardPostProcessing +class PatchPostProcessing : public PostProcessingModel { @@ -77,17 +77,17 @@ protected: public: //- Runtime type information - TypeName("StandardPostProcessing"); + TypeName("PatchPostProcessing"); // Constructors //- Construct from dictionary - StandardPostProcessing(const dictionary& dict, CloudType& owner); + PatchPostProcessing(const dictionary& dict, CloudType& owner); //- Destructor - virtual ~StandardPostProcessing(); + virtual ~PatchPostProcessing(); // Member Functions @@ -122,12 +122,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "StandardPostProcessingI.H" +#include "PatchPostProcessingI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "StandardPostProcessing.C" +# include "PatchPostProcessing.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H similarity index 91% rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessingI.H rename to src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H index aabf85999d..e02358aecf 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/StandardPostProcessing/StandardPostProcessingI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ template -const Foam::polyMesh& Foam::StandardPostProcessing::mesh() const +const Foam::polyMesh& Foam::PatchPostProcessing::mesh() const { return mesh_; } @@ -33,7 +33,7 @@ const Foam::polyMesh& Foam::StandardPostProcessing::mesh() const template const Foam::wordList& -Foam::StandardPostProcessing::patchNames() const +Foam::PatchPostProcessing::patchNames() const { return patchNames_; }