From b01210e58b9b9086c051e7e5eeed0054c13163a3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 22 May 2009 13:54:08 +0100
Subject: [PATCH] added prop headers for post-processing models
---
src/lagrangian/basic/Particle/Particle.H | 9 +++++++--
src/lagrangian/basic/Particle/ParticleIO.C | 6 ++++++
.../Templates/KinematicParcel/KinematicParcel.H | 10 ++++++++--
.../Templates/KinematicParcel/KinematicParcelIO.C | 14 ++++++++++++++
.../ReactingMultiphaseParcel.H | 10 ++++++++--
.../ReactingMultiphaseParcelIO.C | 10 ++++++++++
.../Templates/ReactingParcel/ReactingParcel.H | 10 ++++++++--
.../Templates/ReactingParcel/ReactingParcelIO.C | 9 +++++++++
.../parcels/Templates/ThermoParcel/ThermoParcel.H | 10 ++++++++--
.../Templates/ThermoParcel/ThermoParcelIO.C | 9 +++++++++
10 files changed, 87 insertions(+), 10 deletions(-)
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index e7119c77b66..8035188a65f 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -256,8 +256,13 @@ public:
friend class Cloud<ParticleType>;
- //- Runtime type information
- TypeName("Particle");
+ // Static data members
+
+ //- String representation of properties
+ static string propHeader;
+
+ //- Runtime type information
+ TypeName("Particle");
// Constructors
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 7be84f9d144..70e635dc947 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -28,6 +28,12 @@ License
#include "IOstreams.H"
#include "IOPosition.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::string Foam::Particle<ParticleType>::propHeader = "(Px Py Pz) cellI";
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from Istream
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index f5844669d7d..b448958e798 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -249,8 +249,14 @@ protected:
public:
- //- Runtime type information
- TypeName("KinematicParcel");
+ // Static data members
+
+ //- String representation of properties
+ static string propHeader;
+
+ //- Runtime type information
+ TypeName("KinematicParcel");
+
friend class Cloud<ParcelType>;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index ae96d25a14a..88ca25973e4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -29,6 +29,20 @@ License
#include "IOField.H"
#include "Cloud.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+ Particle<ParcelType>::propHeader
+ + " typeId"
+ + " nParticle"
+ + " d"
+ + " (Ux Uy Uz)"
+ + " rho"
+ + " tTurb"
+ + " UTurb";
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index ba35eadfe1f..e117fb68404 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -262,8 +262,14 @@ protected:
public:
- //- Runtime type information
- TypeName("ReactingMultiphaseParcel");
+ // Static data members
+
+ //- String representation of properties
+ static string propHeader;
+
+ //- Runtime type information
+ TypeName("ReactingMultiphaseParcel");
+
friend class Cloud<ParcelType>;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index bbf58e49a04..4ff1581e14f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -27,6 +27,16 @@ License
#include "ReactingMultiphaseParcel.H"
#include "IOstreams.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propHeader =
+ ReactingParcel<ParcelType>::propHeader
+ + " nGas(Y1..YN)"
+ + " nLiquid(Y1..YN)"
+ + " nSolid(Y1..YN)";
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index f333bd0a8be..7c8fb0e7b57 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -214,8 +214,14 @@ protected:
public:
- //- Runtime type information
- TypeName("ReactingParcel");
+ // Static data members
+
+ //- String representation of properties
+ static string propHeader;
+
+ //- Runtime type information
+ TypeName("ReactingParcel");
+
friend class Cloud<ParcelType>;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 968c608d7e2..eecbc499e96 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -27,6 +27,15 @@ License
#include "ReactingParcel.H"
#include "IOstreams.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ReactingParcel<ParcelType>::propHeader =
+ ThermoParcel<ParcelType>::propHeader
+ + " mass0"
+ + " nPhases(Y1..YN)";
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 800c0388682..d8d71d69a74 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -228,8 +228,14 @@ protected:
public:
- //- Runtime type information
- TypeName("ThermoParcel");
+ // Static data members
+
+ //- String representation of properties
+ static string propHeader;
+
+ //- Runtime type information
+ TypeName("ThermoParcel");
+
friend class Cloud<ParcelType>;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index d4f30ce9173..827b2f36f41 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -27,6 +27,15 @@ License
#include "ThermoParcel.H"
#include "IOstreams.H"
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
+ KinematicParcel<ParcelType>::propHeader
+ + " T"
+ + " cp";
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
--
GitLab