From 99a1eee0243cd76feae05bb0cb5013d07ae7781b Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 30 Nov 2016 17:18:48 +0000
Subject: [PATCH] ENH: Lagrangian - added functions to add particle data as
fields on an object registry
---
src/OpenFOAM/fields/cloud/cloud.C | 9 +-
src/OpenFOAM/fields/cloud/cloud.H | 27 ++++-
src/OpenFOAM/fields/cloud/cloudTemplates.C | 60 +++++++++++
src/lagrangian/basic/particle/particle.H | 4 +
.../basic/particle/particleTemplates.C | 25 ++++-
.../Templates/KinematicCloud/KinematicCloud.C | 7 ++
.../Templates/KinematicCloud/KinematicCloud.H | 5 +-
.../Templates/ReactingCloud/ReactingCloud.C | 7 ++
.../Templates/ReactingCloud/ReactingCloud.H | 5 +-
.../kinematicCloud/kinematicCloud.H | 32 +++---
.../CollidingParcel/CollidingParcel.H | 4 +
.../CollidingParcel/CollidingParcelIO.C | 33 ++++++
.../KinematicParcel/KinematicParcel.H | 4 +
.../KinematicParcel/KinematicParcelIO.C | 51 ++++++++-
.../Templates/MPPICParcel/MPPICParcel.H | 4 +
.../Templates/MPPICParcel/MPPICParcelIO.C | 30 +++++-
.../ReactingMultiphaseParcel.H | 24 ++++-
.../ReactingMultiphaseParcelIO.C | 102 ++++++++++++++++++
.../Templates/ReactingParcel/ReactingParcel.H | 24 ++++-
.../ReactingParcel/ReactingParcelIO.C | 70 ++++++++++++
.../Templates/ThermoParcel/ThermoParcel.H | 4 +
.../Templates/ThermoParcel/ThermoParcelIO.C | 28 +++++
.../Templates/SprayParcel/SprayParcel.H | 18 ++++
.../Templates/SprayParcel/SprayParcelIO.C | 70 ++++++++++++
24 files changed, 617 insertions(+), 30 deletions(-)
create mode 100644 src/OpenFOAM/fields/cloud/cloudTemplates.C
diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C
index 69cba912e0e..172d6aac743 100644
--- a/src/OpenFOAM/fields/cloud/cloud.C
+++ b/src/OpenFOAM/fields/cloud/cloud.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -36,7 +36,6 @@ namespace Foam
word cloud::defaultName("defaultCloud");
}
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName)
@@ -70,4 +69,10 @@ void Foam::cloud::autoMap(const mapPolyMesh&)
}
+void Foam::cloud::writeObjects(objectRegistry& obr) const
+{
+ NotImplemented;
+}
+
+
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H
index 9b7aa432917..844cb9db4e5 100644
--- a/src/OpenFOAM/fields/cloud/cloud.H
+++ b/src/OpenFOAM/fields/cloud/cloud.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -36,6 +36,7 @@ SourceFiles
#define cloud_H
#include "objectRegistry.H"
+#include "IOField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -92,6 +93,24 @@ public:
//- Remap the cells of particles corresponding to the
// mesh topology change
virtual void autoMap(const mapPolyMesh&);
+
+
+ // I-O
+
+ //- Read particle fields from objects in the obr registry
+ //virtual void readObjects(objectRegistry& obr);
+
+ //- Write particle fields as objects into the obr registry
+ virtual void writeObjects(objectRegistry& obr) const;
+
+ //- Helper to construct IOField on a supplied object registry
+ template<class Type>
+ static IOField<Type>& createIOField
+ (
+ const word& fieldName,
+ const label nParticle,
+ objectRegistry& obr
+ );
};
@@ -101,6 +120,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#ifdef NoRepository
+ #include "cloudTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
#endif
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/cloud/cloudTemplates.C b/src/OpenFOAM/fields/cloud/cloudTemplates.C
new file mode 100644
index 00000000000..1b5b2ee8b25
--- /dev/null
+++ b/src/OpenFOAM/fields/cloud/cloudTemplates.C
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::IOField<Type>& Foam::cloud::createIOField
+(
+ const word& fieldName,
+ const label nParticle,
+ objectRegistry& obr
+)
+{
+ IOField<Type>* fieldPtr
+ (
+ new IOField<Type>
+ (
+ IOobject
+ (
+ fieldName,
+ obr.time().timeName(),
+ obr,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ nParticle
+ )
+ );
+
+ fieldPtr->store();
+
+ return *fieldPtr;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index 9f0856e4fa8..d94db0dd561 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -574,6 +574,10 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType>
+ static void writeObjects(const CloudType& c, objectRegistry& obr);
+
//- Write the particle position and cell
void writePosition(Ostream&) const;
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index aa84ad9084c..95f018665c9 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -162,7 +162,7 @@ void Foam::particle::writeFields(const CloudType& c)
IOPosition<CloudType> ioP(c);
ioP.write();
- label np = c.size();
+ label np = c.size();
IOField<label> origProc
(
@@ -184,6 +184,29 @@ void Foam::particle::writeFields(const CloudType& c)
}
+template<class CloudType>
+void Foam::particle::writeObjects(const CloudType& c, objectRegistry& obr)
+{
+ label np = c.size();
+
+ IOField<vector>& position
+ (
+ cloud::createIOField<vector>("position", np, obr)
+ );
+ IOField<label>& origProc(cloud::createIOField<label>("origProc", np, obr));
+ IOField<label>& origId(cloud::createIOField<label>("origId", np, obr));
+
+ label i = 0;
+ forAllConstIter(typename CloudType, c, iter)
+ {
+ position[i] = iter().position_;
+ origProc[i] = iter().origProc_;
+ origId[i] = iter().origId_;
+ i++;
+ }
+}
+
+
template<class TrackData>
Foam::label Foam::particle::track(const vector& endPosition, TrackData& td)
{
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index de5e0d57da6..d82b1bba674 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -895,4 +895,11 @@ void Foam::KinematicCloud<CloudType>::info()
}
+template<class CloudType>
+void Foam::KinematicCloud<CloudType>::writeObjects(objectRegistry& obr) const
+{
+ parcelType::writeObjects(*this, obr);
+}
+
+
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index f61af75bbd5..d0c8b57603a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -612,6 +612,9 @@ public:
//- Print cloud information
void info();
+
+ //- Write particle fields as objects into the obr registry
+ virtual void writeObjects(objectRegistry& obr) const;
};
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index d168d158e6e..64476622555 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -362,4 +362,11 @@ void Foam::ReactingCloud<CloudType>::writeFields() const
}
+template<class CloudType>
+void Foam::ReactingCloud<CloudType>::writeObjects(objectRegistry& obr) const
+{
+ CloudType::particleType::writeObjects(*this, this->composition(), obr);
+}
+
+
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 0caccbcf797..bfb0952677b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -313,6 +313,9 @@ public:
//- Write the field data for the cloud
virtual void writeFields() const;
+
+ //- Write particle fields as objects into the obr registry
+ virtual void writeObjects(objectRegistry& obr) const;
};
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index b3caba28d26..675f09e6bdc 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -63,11 +63,15 @@ public:
//- Runtime type information
TypeName("kinematicCloud");
+
// Constructors
//- Null constructor
kinematicCloud();
+ //- Destructor
+ virtual ~kinematicCloud();
+
// Member functions
@@ -92,26 +96,22 @@ public:
virtual scalar Dmax() const = 0;
- // Fields
+ // Fields
- //- Volume swept rate of parcels per cell
- virtual const tmp<volScalarField> vDotSweep() const = 0;
+ //- Volume swept rate of parcels per cell
+ virtual const tmp<volScalarField> vDotSweep() const = 0;
- //- Return the particle volume fraction field
- // Note: for particles belonging to this cloud only
- virtual const tmp<volScalarField> theta() const = 0;
+ //- Return the particle volume fraction field
+ // Note: for particles belonging to this cloud only
+ virtual const tmp<volScalarField> theta() const = 0;
- //- Return the particle mass fraction field
- // Note: for particles belonging to this cloud only
- virtual const tmp<volScalarField> alpha() const = 0;
+ //- Return the particle mass fraction field
+ // Note: for particles belonging to this cloud only
+ virtual const tmp<volScalarField> alpha() const = 0;
- //- Return the particle effective density field
- // Note: for particles belonging to this cloud only
- virtual const tmp<volScalarField> rhoEff() const = 0;
-
-
- //- Destructor
- virtual ~kinematicCloud();
+ //- Return the particle effective density field
+ // Note: for particles belonging to this cloud only
+ virtual const tmp<volScalarField> rhoEff() const = 0;
};
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
index 28d92d99a2f..a2d5b155095 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
@@ -307,6 +307,10 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType>
+ static void writeObjects(const CloudType& c, objectRegistry& obr);
+
// Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
index 8f0c8b6b468..a5d5074f527 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelIO.C
@@ -274,6 +274,39 @@ void Foam::CollidingParcel<ParcelType>::writeFields(const CloudType& c)
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::CollidingParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ IOField<vector>& f(cloud::createIOField<vector>("f", np, obr));
+ IOField<vector>& angularMomentum
+ (
+ cloud::createIOField<vector>("angularMomentum", np, obr)
+ );
+ IOField<vector>& torque(cloud::createIOField<vector>("torque", np, obr));
+
+ label i = 0;
+ forAllConstIter(typename CloudType, c, iter)
+ {
+ const CollidingParcel<ParcelType>& p = iter();
+
+ f[i] = p.f();
+ angularMomentum[i] = p.angularMomentum();
+ torque[i] = p.torque();
+
+ i++;
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 40273fef645..dd45972ca27 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -660,6 +660,10 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType>
+ static void writeObjects(const CloudType& c, objectRegistry& obr);
+
// Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 22da248dd60..51b263c0c7e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -171,7 +171,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
{
ParcelType::writeFields(c);
- label np = c.size();
+ label np = c.size();
IOField<label> active(c.fieldIOobject("active", IOobject::NO_READ), np);
IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
@@ -221,6 +221,55 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const CloudType& c)
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::KinematicParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+DebugInFunction << endl;
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ IOField<label>& active(cloud::createIOField<label>("active", np, obr));
+ IOField<label>& typeId(cloud::createIOField<label>("typeId", np, obr));
+ IOField<scalar>& nParticle
+ (
+ cloud::createIOField<scalar>("nParticle", np, obr)
+ );
+ IOField<scalar>& d(cloud::createIOField<scalar>("d", np, obr));
+ IOField<scalar>& dTarget(cloud::createIOField<scalar>("dTarget", np, obr));
+ IOField<vector>& U(cloud::createIOField<vector>("U", np, obr));
+ IOField<scalar>& rho(cloud::createIOField<scalar>("rho", np, obr));
+ IOField<scalar>& age(cloud::createIOField<scalar>("age", np, obr));
+ IOField<scalar>& tTurb(cloud::createIOField<scalar>("tTurb", np, obr));
+ IOField<vector>& UTurb(cloud::createIOField<vector>("UTurb", np, obr));
+
+ label i = 0;
+
+ forAllConstIter(typename CloudType, c, iter)
+ {
+ const KinematicParcel<ParcelType>& p = iter();
+
+ active[i] = p.active();
+ typeId[i] = p.typeId();
+ nParticle[i] = p.nParticle();
+ d[i] = p.d();
+ dTarget[i] = p.dTarget();
+ U[i] = p.U();
+ rho[i] = p.rho();
+ age[i] = p.age();
+ tTurb[i] = p.tTurb();
+ UTurb[i] = p.UTurb();
+
+ i++;
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
index 26083c6a2b3..c932590a9ca 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H
@@ -297,6 +297,10 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType>
+ static void writeObjects(const CloudType& c, objectRegistry& obr);
+
// Ostream operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
index 28af8d627e1..452b5b0eab6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C
@@ -110,7 +110,7 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
{
ParcelType::writeFields(c);
- label np = c.size();
+ label np = c.size();
IOField<vector>
UCorrect(c.fieldIOobject("UCorrect", IOobject::NO_READ), np);
@@ -130,6 +130,34 @@ void Foam::MPPICParcel<ParcelType>::writeFields(const CloudType& c)
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::MPPICParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ IOField<vector>&
+ UCorrect(cloud::createIOField<vector>("UCorrect", np, obr));
+
+ label i = 0;
+
+ forAllConstIter(typename CloudType, c, iter)
+ {
+ const MPPICParcel<ParcelType>& p = iter();
+
+ UCorrect[i] = p.UCorrect();
+
+ i++;
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 5b2a38eafce..c9525627d41 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -433,7 +433,7 @@ public:
// I-O
- //- Read
+ //- Read - composition supplied
template<class CloudType, class CompositionType>
static void readFields
(
@@ -445,7 +445,7 @@ public:
template<class CloudType>
static void readFields(CloudType& c);
- //- Write
+ //- Write - composition supplied
template<class CloudType, class CompositionType>
static void writeFields
(
@@ -453,10 +453,28 @@ public:
const CompositionType& compModel
);
- //- Read - composition supplied
+ //- Read - no composition
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ // - no composition
+ template<class CloudType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ objectRegistry& obr
+ );
+
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType, class CompositionType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+ );
+
// Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 2a776383ae1..cf15a6d4978 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -327,6 +327,108 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+}
+
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ // Write the composition fractions
+ if (np > 0)
+ {
+ const wordList& stateLabels = compModel.stateLabels();
+
+ const label idGas = compModel.idGas();
+ const wordList& gasNames = compModel.componentNames(idGas);
+ forAll(gasNames, j)
+ {
+ const word fieldName = "Y" + gasNames[j] + stateLabels[idGas];
+ IOField<scalar>& YGas
+ (
+ cloud::createIOField<scalar>(fieldName, np, obr)
+ );
+
+ label i = 0;
+ forAllConstIter
+ (
+ typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
+ c,
+ iter
+ )
+ {
+ const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+ YGas[i++] = p0.YGas()[j]*p0.Y()[GAS];
+ }
+ }
+
+ const label idLiquid = compModel.idLiquid();
+ const wordList& liquidNames = compModel.componentNames(idLiquid);
+ forAll(liquidNames, j)
+ {
+ const word fieldName = "Y" + liquidNames[j] + stateLabels[idLiquid];
+ IOField<scalar>& YLiquid
+ (
+ cloud::createIOField<scalar>(fieldName, np, obr)
+ );
+
+ label i = 0;
+ forAllConstIter
+ (
+ typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
+ c,
+ iter
+ )
+ {
+ const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+ YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQ];
+ }
+ }
+
+ const label idSolid = compModel.idSolid();
+ const wordList& solidNames = compModel.componentNames(idSolid);
+ forAll(solidNames, j)
+ {
+ const word fieldName = "Y" + solidNames[j] + stateLabels[idSolid];
+ IOField<scalar>& YSolid
+ (
+ cloud::createIOField<scalar>(fieldName, np, obr)
+ );
+
+ label i = 0;
+ forAllConstIter
+ (
+ typename Cloud<ReactingMultiphaseParcel<ParcelType>>,
+ c,
+ iter
+ )
+ {
+ const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+ YSolid[i++] = p0.YSolid()[j]*p0.Y()[SLD];
+ }
+ }
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 40beface593..c5463d92968 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -391,7 +391,7 @@ public:
// I-O
- //- Read
+ //- Read - composition supplied
template<class CloudType, class CompositionType>
static void readFields
(
@@ -403,7 +403,7 @@ public:
template<class CloudType>
static void readFields(CloudType& c);
- //- Write
+ //- Write - composition supplied
template<class CloudType, class CompositionType>
static void writeFields
(
@@ -411,11 +411,29 @@ public:
const CompositionType& compModel
);
- //- Write - composition supplied
+ //- Write - no composition
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ // - no composition
+ template<class CloudType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ objectRegistry& obr
+ );
+
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType, class CompositionType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+ );
+
// Ostream Operator
friend Ostream& operator<< <ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 3eb02e4e2a6..e87a72342cc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -234,6 +234,76 @@ void Foam::ReactingParcel<ParcelType>::writeFields
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::ReactingParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+}
+
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
+void Foam::ReactingParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+)
+{
+DebugInFunction << endl;
+
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ if (np > 0)
+ {
+ IOField<scalar>& mass0(cloud::createIOField<scalar>("mass0", np, obr));
+
+ label i = 0;
+ forAllConstIter(typename Cloud<ReactingParcel<ParcelType>>, c, iter)
+ {
+ const ReactingParcel<ParcelType>& p = iter();
+ mass0[i++] = p.mass0_;
+ }
+
+ // Write the composition fractions
+ const wordList& phaseTypes = compModel.phaseTypes();
+ wordList stateLabels(phaseTypes.size(), "");
+ if (compModel.nPhase() == 1)
+ {
+ stateLabels = compModel.stateLabels()[0];
+ }
+
+ forAll(phaseTypes, j)
+ {
+ const word fieldName = "Y" + phaseTypes[j] + stateLabels[j];
+ IOField<scalar>& Y
+ (
+ cloud::createIOField<scalar>(fieldName, np, obr)
+ );
+
+ label i = 0;
+ forAllConstIter
+ (
+ typename Cloud<ReactingParcel<ParcelType>>,
+ c,
+ iter
+ )
+ {
+ const ReactingParcel<ParcelType>& p = iter();
+ Y[i++] = p.Y()[j];
+ }
+ }
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index e90ae550779..c0a6777e06c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -450,6 +450,10 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType>
+ static void writeObjects(const CloudType& c, objectRegistry& obr);
+
// Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index da0b6bd5ae1..084e28ca1b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -137,6 +137,34 @@ void Foam::ThermoParcel<ParcelType>::writeFields(const CloudType& c)
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::ThermoParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+DebugInFunction << endl;
+ ParcelType::writeObjects(c, obr);
+
+ label np = c.size();
+
+ IOField<scalar>& T(cloud::createIOField<scalar>("T", np, obr));
+ IOField<scalar>& Cp(cloud::createIOField<scalar>("Cp", np, obr));
+
+ label i = 0;
+ forAllConstIter(typename Cloud<ThermoParcel<ParcelType>>, c, iter)
+ {
+ const ThermoParcel<ParcelType>& p = iter();
+
+ T[i] = p.T_;
+ Cp[i] = p.Cp_;
+ i++;
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
index 24df39ca9be..98bf7fcc227 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H
@@ -506,6 +506,24 @@ public:
template<class CloudType>
static void writeFields(const CloudType& c);
+ //- Write particle fields as objects into the obr registry
+ // - no composition
+ template<class CloudType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ objectRegistry& obr
+ );
+
+ //- Write particle fields as objects into the obr registry
+ template<class CloudType, class CompositionType>
+ static void writeObjects
+ (
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+ );
+
// Ostream Operator
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 482bb4e42bd..1afeb4d32b5 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -283,6 +283,76 @@ void Foam::SprayParcel<ParcelType>::writeFields
}
+template<class ParcelType>
+template<class CloudType>
+void Foam::SprayParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, obr);
+}
+
+
+template<class ParcelType>
+template<class CloudType, class CompositionType>
+void Foam::SprayParcel<ParcelType>::writeObjects
+(
+ const CloudType& c,
+ const CompositionType& compModel,
+ objectRegistry& obr
+)
+{
+ ParcelType::writeObjects(c, compModel, obr);
+
+ label np = c.size();
+
+ IOField<scalar>& d0(cloud::createIOField<scalar>("d0", np, obr));
+ IOField<vector>& position0
+ (
+ cloud::createIOField<vector>("position0", np, obr)
+ );
+ IOField<scalar>& sigma(cloud::createIOField<scalar>("sigma", np, obr));
+ IOField<scalar>& mu(cloud::createIOField<scalar>("mu", np, obr));
+ IOField<scalar>& liquidCore
+ (
+ cloud::createIOField<scalar>("liquidCore", np, obr)
+ );
+ IOField<scalar>& KHindex(cloud::createIOField<scalar>("KHindex", np, obr));
+ IOField<scalar>& y(cloud::createIOField<scalar>("y", np, obr));
+ IOField<scalar>& yDot(cloud::createIOField<scalar>("yDot", np, obr));
+ IOField<scalar>& tc(cloud::createIOField<scalar>("tc", np, obr));
+ IOField<scalar>& ms(cloud::createIOField<scalar>("ms", np, obr));
+ IOField<scalar>& injector
+ (
+ cloud::createIOField<scalar>("injector", np, obr)
+ );
+ IOField<scalar>& tMom(cloud::createIOField<scalar>("tMom", np, obr));
+ IOField<scalar>& user(cloud::createIOField<scalar>("user", np, obr));
+
+ label i = 0;
+ forAllConstIter(typename Cloud<SprayParcel<ParcelType>>, c, iter)
+ {
+ const SprayParcel<ParcelType>& p = iter();
+ d0[i] = p.d0_;
+ position0[i] = p.position0_;
+ sigma[i] = p.sigma_;
+ mu[i] = p.mu_;
+ liquidCore[i] = p.liquidCore_;
+ KHindex[i] = p.KHindex_;
+ y[i] = p.y_;
+ yDot[i] = p.yDot_;
+ tc[i] = p.tc_;
+ ms[i] = p.ms_;
+ injector[i] = p.injector_;
+ tMom[i] = p.tMom_;
+ user[i] = p.user_;
+ i++;
+ }
+}
+
+
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class ParcelType>
--
GitLab