diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H index e7119c77b66573d5f7869931e462879bc6ceb58e..8035188a65f9c263b461b62506348b9087d9f023 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 7be84f9d1449e3721369caf4413e436f809992a4..70e635dc94765e8e3b321fbf98d45b3a8259b91c 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 f5844669d7d5db567cae094529c1b716177eb244..b448958e798b055b2a930b67189976308603608c 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 ae96d25a14ab212f2c14a03d86b9a6d0b61f3e8f..88ca25973e4dba637fa5ea2078b11d8d4a0702fc 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 ba35eadfe1f898c345ecf6e31cb43311eee13a65..e117fb68404e74af68f9e43eed0732fbf7ce733f 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 bbf58e49a04cfd0ccf3891ea318cf5824b6d2557..4ff1581e14f2c7b76ab810c6ad71bf516362309e 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 f333bd0a8be0472eefae39db18b1e3c5cb8b5621..7c8fb0e7b5709b74b5f96daeb5bfbbfaec813e09 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 968c608d7e2ed252332271828c33c1208a3c8334..eecbc499e9641d75e4bf807927365b21916b5891 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 800c03886825e45a2ce3e4a94ba3c7ae6c20e117..d8d71d69a74e1c263d4c93d3012ce5d0e3d36007 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 d4f30ce91734218f78c7108d4c937b11a76e058f..827b2f36f41ec7f94068c8f6a7213800d2fa26bb 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>