From 98bd47cc08156623ab95a3ae39d0fdeb85b5860d Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Mon, 22 Jun 2009 18:36:22 +0100 Subject: [PATCH] removing old (no longer used) tracking stuff --- .../Make/files | 0 .../Make/options | 0 .../UEqn.H | 0 .../YEqn.H | 0 .../chemistry.H | 0 .../createClouds.H | 0 .../createFields.H | 0 .../createMulticomponentPointSources.H | 0 .../createPorousZones.H | 0 .../hEqn.H | 0 .../pEqn.H | 0 .../porousExplicitSourceReactingParcelFoam.C} | 0 .../readChemistryProperties.H | 0 .../rhoEqn.H | 0 .../ParticleTrackingData.C | 72 ------ .../ParticleTrackingData.H | 166 ------------- .../ParticleTrackingDataI.H | 49 ---- .../ParticleTrackingDataIO.C | 233 ------------------ src/lagrangian/intermediate/Make/files | 7 - .../BasicTrackedReactingCloud.C | 70 ------ .../BasicTrackedReactingCloud.H | 113 --------- .../defineBasicTrackedReactingCloud.C | 38 --- .../TrackedReactingParcel.C | 47 ---- .../TrackedReactingParcel.H | 169 ------------- .../TrackedReactingParcelI.H | 72 ------ .../TrackedReactingParcelIO.C | 105 -------- .../BasicTrackedReactingParcel.C | 113 --------- .../BasicTrackedReactingParcel.H | 137 ---------- .../defineTrackedReactingParcel.C | 38 --- .../makeBasicTrackedReactingParcelSubmodels.C | 63 ----- .../filter/0.org/G | 0 .../filter/0.org/H2O | 0 .../filter/0.org/N2 | 0 .../filter/0.org/O2 | 0 .../filter/0.org/T | 0 .../filter/0.org/U | 0 .../filter/0.org/alphat | 0 .../filter/0.org/epsilon | 0 .../filter/0.org/k | 0 .../filter/0.org/mut | 0 .../filter/0.org/p | 0 .../filter/0/G | 0 .../filter/0/H2O | 0 .../filter/0/N2 | 0 .../filter/0/O2 | 0 .../filter/0/T | 0 .../filter/0/U | 0 .../filter/0/alphat | 0 .../filter/0/epsilon | 0 .../filter/0/k | 0 .../filter/0/mut | 0 .../filter/0/p | 0 .../filter/Allclean | 0 .../filter/Allrun | 0 .../filter/constant/RASProperties | 0 .../filter/constant/chemistryProperties | 0 .../filter/constant/environmentalProperties | 0 .../filter/constant/parcelInjectionProperties | 0 .../filter/constant/particleTrackProperties | 0 .../constant/pointMassSourcesProperties | 0 .../filter/constant/polyMesh/blockMeshDict | 0 .../filter/constant/porousZones | 0 .../filter/constant/radiationProperties | 0 .../filter/constant/reactingCloud1Positions | 0 .../filter/constant/reactingCloud1Properties | 0 .../filter/constant/reactions | 0 .../filter/constant/thermo.incompressiblePoly | 0 .../filter/constant/thermophysicalProperties | 0 .../filter/constant/turbulenceProperties | 0 .../filter/system/cellSetDict | 0 .../filter/system/controlDict | 0 .../filter/system/decomposeParDict | 0 .../filter/system/fvSchemes | 0 .../filter/system/fvSolution | 0 .../filter/system/sets.setSet | 0 75 files changed, 1492 deletions(-) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/Make/files (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/Make/options (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/UEqn.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/YEqn.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/chemistry.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/createClouds.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/createFields.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/createMulticomponentPointSources.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/createPorousZones.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/hEqn.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/pEqn.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam/trackedReactingParcelFoam.C => porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C} (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/readChemistryProperties.H (100%) rename applications/solvers/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/rhoEqn.H (100%) delete mode 100644 src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C delete mode 100644 src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H delete mode 100644 src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H delete mode 100644 src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C delete mode 100644 src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C delete mode 100644 src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H delete mode 100644 src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C delete mode 100644 src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H delete mode 100644 src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H delete mode 100644 src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H delete mode 100644 src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/G (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/H2O (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/N2 (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/O2 (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/T (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/U (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/alphat (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/epsilon (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/k (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/mut (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0.org/p (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/G (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/H2O (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/N2 (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/O2 (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/T (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/U (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/alphat (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/epsilon (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/k (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/mut (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/0/p (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/Allclean (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/Allrun (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/RASProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/chemistryProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/environmentalProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/parcelInjectionProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/particleTrackProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/pointMassSourcesProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/polyMesh/blockMeshDict (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/porousZones (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/radiationProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/reactingCloud1Positions (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/reactingCloud1Properties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/reactions (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/thermo.incompressiblePoly (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/constant/turbulenceProperties (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/cellSetDict (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/controlDict (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/decomposeParDict (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/fvSchemes (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/fvSolution (100%) rename tutorials/lagrangian/{trackedReactingParcelFoam => porousExplicitSourceReactingParcelFoam}/filter/system/sets.setSet (100%) diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/files b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/Make/files rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createMulticomponentPointSources.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createMulticomponentPointSources.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createMulticomponentPointSources.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createMulticomponentPointSources.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H similarity index 100% rename from applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H rename to applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C deleted file mode 100644 index 80f1dcaaf70..00000000000 --- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.C +++ /dev/null @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "ParticleTrackingData.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -template<class ParcelType> -Foam::label Foam::ParticleTrackingData<ParcelType>::PARTICLE_COUNT = 0; - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template<class ParcelType> -Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData -( - const Cloud<ParcelType>& cloud -) -: - cloud_(cloud), - origProc_(Pstream::myProcNo()), - id_(PARTICLE_COUNT++) -{} - - -template<class ParcelType> -Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData -( - const ParticleTrackingData& ptd -) -: - cloud_(ptd.cloud_), - origProc_(ptd.origProc_), - id_(ptd.id_) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template<class ParcelType> -Foam::ParticleTrackingData<ParcelType>::~ParticleTrackingData() -{} - - -// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // - -#include "ParticleTrackingDataIO.C" - -// ************************************************************************* // diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H deleted file mode 100644 index c752c2ec366..00000000000 --- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingData.H +++ /dev/null @@ -1,166 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::ParticleTrackingData - -Description - Class to provide additional properties to allow construction of - particle tracks - -SourceFiles - ParticleTrackingData.C - ParticleTrackingDataIO.C - -\*---------------------------------------------------------------------------*/ - -#ifndef ParticleTrackingData_H -#define ParticleTrackingData_H - -#include "Cloud.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes and friend functions -template<class ParcelType> -class ParticleTrackingData; - - -template<class ParcelType> -Ostream& operator<< -( - Ostream&, - const ParticleTrackingData<ParcelType>& -); - - -/*---------------------------------------------------------------------------*\ - Class ParticleTrackingData Declaration -\*---------------------------------------------------------------------------*/ - -template<class ParcelType> -class ParticleTrackingData -{ - // Private data - - //- Reference to the cloud - const Cloud<ParcelType>& cloud_; - - //- Originating processor id - label origProc_; - - //- Local particle id - label id_; - - //- Cumulative particle count used for particle id - static label PARTICLE_COUNT; - - - // Private member functions - - //- Write properties - particle count - static void writeProperties(const Cloud<ParcelType>& cloud); - - //- Read properties - particle count - static void readProperties(const Cloud<ParcelType>& cloud); - - -public: - - // Constructors - - //- Construct from cloud - ParticleTrackingData(const Cloud<ParcelType>& cloud); - - //- Construct copy - ParticleTrackingData(const ParticleTrackingData& ptd); - - //- Construct from Istream and mesh - ParticleTrackingData - ( - const Cloud<ParcelType>& cloud, - Istream& is, - bool readFields - ); - - - //- Destructor - ~ParticleTrackingData(); - - - // Member functions - - // Access - - //- Return const access to the cloud - inline const Cloud<ParcelType>& cloud() const; - - //- Return const access to the originating processor id - inline label origProc() const; - - //- Return const access to the local particle id - inline label id() const; - - - // I-O - - //- Read fields - static void readFields(Cloud<ParcelType>& c); - - //- Write fields - static void writeFields(const Cloud<ParcelType>& c); - - - // Ostream Operator - - friend Ostream& operator<< <ParcelType> - ( - Ostream&, - const ParticleTrackingData<ParcelType>& - ); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "ParticleTrackingDataI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository -# include "ParticleTrackingData.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H deleted file mode 100644 index da195d56274..00000000000 --- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataI.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -template<class ParcelType> -inline const Foam::Cloud<ParcelType>& -Foam::ParticleTrackingData<ParcelType>::cloud() const -{ - return cloud_; -} - - -template<class ParcelType> -inline Foam::label Foam::ParticleTrackingData<ParcelType>::origProc() const -{ - return origProc_; -} - - -template<class ParcelType> -inline Foam::label Foam::ParticleTrackingData<ParcelType>::id() const -{ - return id_; -} - - -// ************************************************************************* // diff --git a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C b/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C deleted file mode 100644 index e575426eea7..00000000000 --- a/src/lagrangian/basic/ParticleTrackingData/ParticleTrackingDataIO.C +++ /dev/null @@ -1,233 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "ParticleTrackingData.H" - -// * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * * // - -template<class ParcelType> -void Foam::ParticleTrackingData<ParcelType>::readProperties -( - const Cloud<ParcelType>& cloud -) -{ - IOobject propsDictHeader - ( - "particleTrackingProperties", - cloud.db().time().timeName(), - "uniform/Lagrangian"/cloud.name(), - cloud.db(), - IOobject::MUST_READ, - IOobject::NO_WRITE, - false - ); - - if (propsDictHeader.headerOk()) - { - const IOdictionary propsDict(propsDictHeader); - - word procName("processor" + name(Pstream::myProcNo())); - if (propsDict.found(procName)) - { - propsDict.subDict(procName).lookup("particleCount") >> - PARTICLE_COUNT; - } - } -} - - -template<class ParcelType> -void Foam::ParticleTrackingData<ParcelType>::writeProperties -( - const Cloud<ParcelType>& cloud -) -{ - if (cloud.db().time().outputTime()) - { - IOdictionary propsDict - ( - IOobject - ( - "particleTrackingProperties", - cloud.db().time().timeName(), - "uniform/Lagrangian"/cloud.name(), - cloud.db(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ) - ); - - word procName("processor" + name(Pstream::myProcNo())); - propsDict.add(procName, dictionary()); - propsDict.subDict(procName).add("particleCount", PARTICLE_COUNT); - - propsDict.regIOobject::write(); - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template<class ParcelType> -Foam::ParticleTrackingData<ParcelType>::ParticleTrackingData -( - const Cloud<ParcelType>& cloud, - Istream& is, - bool readFields -) -: - cloud_(cloud), - origProc_(-1), - id_(-1) -{ - if (readFields) - { - if (is.format() == IOstream::ASCII) - { - is >> origProc_ >> id_; - } - else - { - is.read - ( - reinterpret_cast<char*>(&origProc_), - sizeof(origProc_) + sizeof(id_) - ); - } - } - - // Check state of Istream - is.check - ( - "ParticleTrackingData<ParcelType>::ParticleTrackingData" - "(" - "Istream&, " - "bool" - ")" - ); -} - - -template<class ParcelType> -void Foam::ParticleTrackingData<ParcelType>::readFields -( - Cloud<ParcelType>& c -) -{ - if (!c.size()) - { - return; - } - - readProperties(c); - - IOField<label> origProc(c.fieldIOobject("origProc", IOobject::MUST_READ)); - c.checkFieldIOobject(c, origProc); - - IOField<label> id(c.fieldIOobject("id", IOobject::MUST_READ)); - c.checkFieldIOobject(c, id); - - label i = 0; - forAllIter(typename Cloud<ParcelType>, c, iter) - { - ParcelType& p = iter(); - p.origProc_ = origProc[i]; - p.id_ = id[i]; - i++; - } -} - - -template<class ParcelType> -void Foam::ParticleTrackingData<ParcelType>::writeFields -( - const Cloud<ParcelType>& c -) -{ - writeProperties(c); - - const label np = c.size(); - - IOField<label> origProc - ( - c.fieldIOobject("origProc", IOobject::NO_READ), - np - ); - IOField<label> id(c.fieldIOobject("id", IOobject::NO_READ), np); - - label i = 0; - forAllConstIter(typename Cloud<ParcelType>, c, iter) - { - const ParcelType& p = iter(); - - origProc[i] = p.origProc(); - id[i] = p.id(); - i++; - } - - origProc.write(); - id.write(); -} - - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // - -template<class ParcelType> -Foam::Ostream& Foam::operator<< -( - Ostream& os, - const ParticleTrackingData<ParcelType>& p -) -{ - if (os.format() == IOstream::ASCII) - { - os << p.origProc_ << token::SPACE << p.id_ << token::SPACE; - } - else - { - os.write - ( - reinterpret_cast<const char*>(&p.origProc_), - sizeof(p.origProc_) + sizeof(p.id_) - ); - } - - // Check state of Ostream - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const ParticleTrackingData<ParcelType>&" - ")" - ); - - return os; -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files index de8bcd33212..c07a3a34fa1 100644 --- a/src/lagrangian/intermediate/Make/files +++ b/src/lagrangian/intermediate/Make/files @@ -23,7 +23,6 @@ $(DERIVEDCLOUDS)/basicKinematicCloud/basicKinematicCloud.C $(DERIVEDCLOUDS)/basicThermoCloud/basicThermoCloud.C $(DERIVEDCLOUDS)/BasicReactingCloud/defineBasicReactingCloud.C $(DERIVEDCLOUDS)/BasicReactingMultiphaseCloud/defineBasicReactingMultiphaseCloud.C -$(DERIVEDCLOUDS)/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C /* kinematic parcel sub-models */ @@ -46,12 +45,6 @@ $(REACTINGPARCEL)/defineBasicReactingParcel.C $(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C -/* tracked reacting parcel sub-models */ -TRACKEDREACTINGPARCEL=$(DERIVEDPARCELS)/BasicTrackedReactingParcel -$(TRACKEDREACTINGPARCEL)/defineTrackedReactingParcel.C -$(TRACKEDREACTINGPARCEL)/makeBasicTrackedReactingParcelSubmodels.C - - /* reacting multiphase parcel sub-models */ REACTINGMPPARCEL=$(DERIVEDPARCELS)/BasicReactingMultiphaseParcel $(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C deleted file mode 100644 index 15b7774a0b8..00000000000 --- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.C +++ /dev/null @@ -1,70 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "BasicTrackedReactingCloud.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template<class ThermoType> -Foam::BasicTrackedReactingCloud<ThermoType>::BasicTrackedReactingCloud -( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const dimensionedVector& g, - basicThermo& thermo -) -: - ReactingCloud<BasicTrackedReactingParcel<ThermoType> > - ( - cloudName, - rho, - U, - g, - thermo - ) -{ - BasicTrackedReactingParcel<ThermoType>::readFields(*this); -} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template<class ThermoType> -Foam::BasicTrackedReactingCloud<ThermoType>::~BasicTrackedReactingCloud() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template<class ThermoType> -void Foam::BasicTrackedReactingCloud<ThermoType>::writeFields() const -{ - BasicTrackedReactingParcel<ThermoType>::writeFields(*this); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H deleted file mode 100644 index bb2b0bde1ef..00000000000 --- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/BasicTrackedReactingCloud.H +++ /dev/null @@ -1,113 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::BasicTrackedReactingCloud - -Description - Tracked racting cloud templated on the type of carrier phase thermodynamics - -SourceFiles - BasicTrackedReactingCloud.C - -\*---------------------------------------------------------------------------*/ - -#ifndef BasicTrackedReactingCloud_H -#define BasicTrackedReactingCloud_H - -#include "ReactingCloud.H" -#include "BasicTrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes -template<class ThermoType> -class BasicTrackedReactingCloud; - -/*---------------------------------------------------------------------------*\ - Class BasicTrackedReactingCloud Declaration -\*---------------------------------------------------------------------------*/ - -template<class ThermoType> -class BasicTrackedReactingCloud -: - public ReactingCloud<BasicTrackedReactingParcel<ThermoType> > -{ - // Private Member Functions - - //- Disallow default bitwise copy construct - BasicTrackedReactingCloud(const BasicTrackedReactingCloud&); - - //- Disallow default bitwise assignment - void operator=(const BasicTrackedReactingCloud&); - - -public: - - //- Runtime type information - TypeName("BasicTrackedReactingCloud"); - - - // Constructors - - //- Construct given carrier gas fields - BasicTrackedReactingCloud - ( - const word& cloudName, - const volScalarField& rho, - const volVectorField& U, - const dimensionedVector& g, - basicThermo& thermo - ); - - - //- Destructor - ~BasicTrackedReactingCloud(); - - - // Member Functions - - //- Write fields - void writeFields() const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "BasicTrackedReactingCloud.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C deleted file mode 100644 index 5c946ca09cb..00000000000 --- a/src/lagrangian/intermediate/clouds/derived/BasicTrackedReactingCloud/defineBasicTrackedReactingCloud.C +++ /dev/null @@ -1,38 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "createReactingCloudTypes.H" -#include "BasicTrackedReactingCloud.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - createReactingCloudType(BasicTrackedReactingCloud); -}; - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C deleted file mode 100644 index b41cb31df94..00000000000 --- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.C +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "TrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template <class ParcelType> -Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel -( - const TrackedReactingParcel<ParcelType>& p -) -: - ReactingParcel<ParcelType>(p), - ParticleTrackingData<ParcelType>(p) -{} - - -// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // - -#include "TrackedReactingParcelIO.C" - -// ************************************************************************* // - diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H deleted file mode 100644 index 8df58f8d2c8..00000000000 --- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcel.H +++ /dev/null @@ -1,169 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::TrackedReactingParcel - -Description - Adds tracking to ReactingParcel - -SourceFiles - TrackedReactingParcelI.H - TrackedReactingParcel.C - TrackedReactingParcelIO.C - -\*---------------------------------------------------------------------------*/ - -#ifndef TrackedReactingParcel_H -#define TrackedReactingParcel_H - -#include "ReactingParcel.H" -#include "ParticleTrackingData.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -template<class ParcelType> -class TrackedReactingParcel; - -// Forward declaration of friend functions - -template<class ParcelType> -Ostream& operator<< -( - Ostream&, - const TrackedReactingParcel<ParcelType>& -); - -/*---------------------------------------------------------------------------*\ - Class TrackedReactingParcel Declaration -\*---------------------------------------------------------------------------*/ - -template<class ParcelType> -class TrackedReactingParcel -: - public ReactingParcel<ParcelType>, - public ParticleTrackingData<ParcelType> -{ -public: - - typedef typename ReactingParcel<ParcelType>::constantProperties - constantProperties; - - // Static data - - //- Runtime type information - TypeName("TrackedReactingParcel"); - - - // Constructors - - //- Construct from owner, position, and cloud owner - // Other properties initialised as null - inline TrackedReactingParcel - ( - ReactingCloud<ParcelType>& owner, - const vector& position, - const label cellI - ); - - //- Construct from components - inline TrackedReactingParcel - ( - ReactingCloud<ParcelType>& owner, - const vector& position, - const label cellI, - const label typeId, - const scalar nParticle0, - const scalar d0, - const vector& U0, - const scalarField& Y0, - const constantProperties& constProps - ); - - //- Construct from Istream - TrackedReactingParcel - ( - const Cloud<ParcelType>& c, - Istream& is, - bool readFields = true - ); - - //- Construct as a copy - TrackedReactingParcel(const TrackedReactingParcel& p); - - //- Construct and return a clone - autoPtr<TrackedReactingParcel> clone() const - { - return - autoPtr<TrackedReactingParcel> - ( - new TrackedReactingParcel(*this) - ); - } - - - // Member Functions - - // I-O - - //- Read - static void readFields(ReactingCloud<ParcelType>& c); - - //- Write - static void writeFields(const ReactingCloud<ParcelType>& c); - - - // Ostream Operator - - friend Ostream& operator<< <ParcelType> - ( - Ostream&, - const TrackedReactingParcel<ParcelType>& - ); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "TrackedReactingParcelI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "TrackedReactingParcel.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // - diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H deleted file mode 100644 index a3bf01eb357..00000000000 --- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelI.H +++ /dev/null @@ -1,72 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template <class ParcelType> -inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel -( - ReactingCloud<ParcelType>& owner, - const vector& position, - const label cellI -) -: - ReactingParcel<ParcelType>(owner, position, cellI), - ParticleTrackingData<ParcelType>(owner) -{} - - -template <class ParcelType> -inline Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel -( - ReactingCloud<ParcelType>& owner, - const vector& position, - const label cellI, - const label typeId, - const scalar nParticle0, - const scalar d0, - const vector& U0, - const scalarField& Y0, - const constantProperties& constProps -) -: - ReactingParcel<ParcelType> - ( - owner, - position, - cellI, - typeId, - nParticle0, - d0, - U0, - Y0, - constProps - ), - ParticleTrackingData<ParcelType>(owner) -{} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C deleted file mode 100644 index 8ce5d9b2f2f..00000000000 --- a/src/lagrangian/intermediate/parcels/Templates/TrackedReactingParcel/TrackedReactingParcelIO.C +++ /dev/null @@ -1,105 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "TrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template <class ParcelType> -Foam::TrackedReactingParcel<ParcelType>::TrackedReactingParcel -( - const Cloud<ParcelType>& cloud, - Istream& is, - bool readFields -) -: - ReactingParcel<ParcelType>(cloud, is, readFields), - ParticleTrackingData<ParcelType>(cloud, is, readFields) -{} - - -template<class ParcelType> -void Foam::TrackedReactingParcel<ParcelType>::readFields -( - ReactingCloud<ParcelType>& c -) -{ - if (!c.size()) - { - return; - } - - ReactingParcel<ParcelType>::readFields(c); - ParticleTrackingData<ParcelType>::readFields(c); -} - - -template<class ParcelType> -void Foam::TrackedReactingParcel<ParcelType>::writeFields -( - const ReactingCloud<ParcelType>& c -) -{ - ReactingParcel<ParcelType>::writeFields(c); - ParticleTrackingData<ParcelType>::writeFields(c); -} - - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // - -template<class ParcelType> -Foam::Ostream& Foam::operator<< -( - Ostream& os, - const TrackedReactingParcel<ParcelType>& p -) -{ - if (os.format() == IOstream::ASCII) - { - os << static_cast<const ReactingParcel<ParcelType>&>(p) - << static_cast<const ParticleTrackingData<ParcelType>&>(p); - } - else - { - os << static_cast<const ReactingParcel<ParcelType>&>(p) - << static_cast<const ParticleTrackingData<ParcelType>&>(p); - } - - // Check state of Ostream - os.check - ( - "Ostream& operator<<" - "(" - "Ostream&, " - "const TrackedReactingParcel<ParcelType>&" - ")" - ); - - return os; -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C deleted file mode 100644 index db48ba437f5..00000000000 --- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.C +++ /dev/null @@ -1,113 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "BasicTrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template<class ThermoType> -Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel -( - ReactingCloud<BasicTrackedReactingParcel<ThermoType> >& owner, - const vector& position, - const label cellI -) -: - TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> > - ( - owner, - position, - cellI - ) -{} - - -template<class ThermoType> -Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel -( - ReactingCloud<BasicTrackedReactingParcel<ThermoType> >& owner, - const vector& position, - const label cellI, - const label typeId, - const scalar nParticle0, - const scalar d0, - const vector& U0, - const scalarField& Y0, - const typename - TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >:: - constantProperties& constProps -) -: - TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> > - ( - owner, - position, - cellI, - typeId, - nParticle0, - d0, - U0, - Y0, - constProps - ) -{} - - -template<class ThermoType> -Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel -( - const Cloud<BasicTrackedReactingParcel<ThermoType> >& cloud, - Istream& is, - bool readFields -) -: - TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> > - ( - cloud, - is, - readFields - ) -{} - - -template<class ThermoType> -Foam::BasicTrackedReactingParcel<ThermoType>::BasicTrackedReactingParcel -( - const BasicTrackedReactingParcel<ThermoType>& p -) -: - TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> >(p) -{} - - -// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * // - -template<class ThermoType> -Foam::BasicTrackedReactingParcel<ThermoType>::~BasicTrackedReactingParcel() -{} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H deleted file mode 100644 index 8c30301f9c2..00000000000 --- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/BasicTrackedReactingParcel.H +++ /dev/null @@ -1,137 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - Foam::BasicTrackedReactingParcel - -Description - - -SourceFiles - BasicTrackedReactingParcel.C - BasicTrackedReactingParcelIO.C - -\*---------------------------------------------------------------------------*/ - -#ifndef BasicTrackedReactingParcel_H -#define BasicTrackedReactingParcel_H - -#include "TrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes -template<class ThermoType> -class BasicTrackedReactingParcel; - -/*---------------------------------------------------------------------------*\ - Class BasicTrackedReactingParcel Declaration -\*---------------------------------------------------------------------------*/ - -template<class ThermoType> -class BasicTrackedReactingParcel -: - public TrackedReactingParcel<BasicTrackedReactingParcel<ThermoType> > -{ - -public: - - //- The type of thermodynamics this parcel was instantiated for - typedef ThermoType thermoType; - - //- Run-time type information - TypeName("BasicTrackedReactingParcel"); - - // Constructors - - //- Construct from owner, position, and cloud owner - // Other properties initialised as null - BasicTrackedReactingParcel - ( - ReactingCloud<BasicTrackedReactingParcel>& owner, - const vector& position, - const label cellI - ); - - //- Construct from components - BasicTrackedReactingParcel - ( - ReactingCloud<BasicTrackedReactingParcel>& owner, - const vector& position, - const label cellI, - const label typeId, - const scalar nParticle0, - const scalar d0, - const vector& U0, - const scalarField& Y0, - const typename - TrackedReactingParcel<BasicTrackedReactingParcel>:: - constantProperties& constProps - ); - - //- Construct from Istream - BasicTrackedReactingParcel - ( - const Cloud<BasicTrackedReactingParcel>& c, - Istream& is, - bool readFields = true - ); - - //- Construct as a copy - BasicTrackedReactingParcel(const BasicTrackedReactingParcel& p); - - //- Construct and return a clone - autoPtr<BasicTrackedReactingParcel> clone() const - { - return - autoPtr<BasicTrackedReactingParcel> - ( - new BasicTrackedReactingParcel(*this) - ); - } - - - //- Destructor - virtual ~BasicTrackedReactingParcel(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "BasicTrackedReactingParcel.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C deleted file mode 100644 index 239ebccb3b4..00000000000 --- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/defineTrackedReactingParcel.C +++ /dev/null @@ -1,38 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "createTrackedReactingParcelTypes.H" -#include "BasicTrackedReactingParcel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - createTrackedReactingParcelType(BasicTrackedReactingParcel); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C deleted file mode 100644 index 7d94a79bea8..00000000000 --- a/src/lagrangian/intermediate/parcels/derived/BasicTrackedReactingParcel/makeBasicTrackedReactingParcelSubmodels.C +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "BasicTrackedReactingParcel.H" - -// Kinematic -#include "makeReactingParcelDispersionModels.H" -#include "makeReactingParcelDragModels.H" -#include "makeReactingParcelInjectionModels.H" -#include "makeReactingParcelPatchInteractionModels.H" -#include "makeReactingParcelPostProcessingModels.H" - -// Thermo -#include "makeReactingParcelHeatTransferModels.H" - -// Reacting -#include "makeReactingParcelCompositionModels.H" -#include "makeReactingParcelPhaseChangeModels.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // Kinematic sub-models - makeReactingDispersionModels(BasicTrackedReactingParcel); - makeReactingDragModels(BasicTrackedReactingParcel); - makeReactingInjectionModels(BasicTrackedReactingParcel); - makeReactingPatchInteractionModels(BasicTrackedReactingParcel); - makeReactingPostProcessingModels(BasicTrackedReactingParcel); - - // Thermo sub-models - makeReactingHeatTransferModels(BasicTrackedReactingParcel); - - // Reacting sub-models - makeReactingCompositionModels(BasicTrackedReactingParcel); - makeReactingPhaseChangeModels(BasicTrackedReactingParcel); -}; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/G rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/G diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/H2O rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/H2O diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2 similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/N2 rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/N2 diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2 similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/O2 rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/O2 diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/T rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/T diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/U rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/U diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/alphat rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/alphat diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/epsilon rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/epsilon diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/k rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/mut rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0.org/p rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/p diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/G b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/G rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/G diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/H2O rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/H2O diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2 similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/N2 rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/N2 diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2 similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/O2 rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/O2 diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/T b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/T rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/T diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/U b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/U rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/U diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/alphat rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/alphat diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/epsilon rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/epsilon diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/k rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/mut rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/0/p b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/0/p rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/p diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/Allclean rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/Allrun rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/RASProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/chemistryProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/chemistryProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/environmentalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/environmentalProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/parcelInjectionProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/particleTrackProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/particleTrackProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/particleTrackProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/pointMassSourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/pointMassSourcesProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/polyMesh/blockMeshDict rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/polyMesh/blockMeshDict diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/porousZones b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/porousZones similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/porousZones rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/porousZones diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/radiationProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/radiationProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Positions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Positions rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Positions diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactingCloud1Properties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/reactions rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactions diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermo.incompressiblePoly rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/thermophysicalProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/constant/turbulenceProperties rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/turbulenceProperties diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/cellSetDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/cellSetDict rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/cellSetDict diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/controlDict rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/decomposeParDict rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSchemes rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/fvSolution rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution diff --git a/tutorials/lagrangian/trackedReactingParcelFoam/filter/system/sets.setSet b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/sets.setSet similarity index 100% rename from tutorials/lagrangian/trackedReactingParcelFoam/filter/system/sets.setSet rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/sets.setSet -- GitLab