diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H index ea0cc38a364133b7c8e4a689dcc9385085390a29..e4a6f6516a4c33ce9e5d37c7cd36e534ea3cc85c 100644 --- a/src/lagrangian/basic/particle/particle.H +++ b/src/lagrangian/basic/particle/particle.H @@ -322,7 +322,7 @@ public: //- String representation of property types DefinePropertyTypes ( - "vector label label scalar label label label label" + "{vector label label scalar label label label label}" ); //- Cumulative particle counter - used to provode unique ID diff --git a/src/lagrangian/basic/particle/particleMacros.H b/src/lagrangian/basic/particle/particleMacros.H index 8bb09dd1338c6ac983defc434fe4a6a17537f127..d54b9621163fcde624a169a0d9b980e07aed4cb1 100644 --- a/src/lagrangian/basic/particle/particleMacros.H +++ b/src/lagrangian/basic/particle/particleMacros.H @@ -66,6 +66,7 @@ namespace Foam //- Define a static 'propertyTypes' for the types of particle properties +// Brace brackets are used to delimit binary write groups // \sa AddToPropertyTypes #define DefinePropertyTypes(str) \ \ @@ -78,6 +79,7 @@ namespace Foam //- Add to existing static 'propertyTypes' for the types of particle properties +// Brace brackets are used to delimit binary write groups // \sa AddToPropertyTypes #define AddToPropertyTypes(ParcelType, str) \ \ diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H index 0e43224e8f660c491100052f5d76472327beee58..338c3186d9af472d0ecfca8f01866d9b8aa6a7c4 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H @@ -162,12 +162,11 @@ public: ); //- String representation of property types - static string propertyTypes() - { - // TODO: collision information types - NotImplemented; - return string::null; - } + AddToPropertyTypes + ( + ParcelType, + "{vector vector vector} *" + ); // Constructors diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 2ec40a105f9d20c8184895ff872b81e341499cfd..fe3d1cbf997d01969cafe2381b620be0ccd0338c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -325,7 +325,7 @@ public: AddToPropertyTypes ( ParcelType, - " label" + "{label" + " label" + " scalar" + " scalar" @@ -334,7 +334,7 @@ public: + " scalar" + " scalar" + " scalar" - + " vector" + + " vector}" ); diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H index 7ebd84fee8b9258cc4f802601276b820ad52f5a8..22d48d5d0308bf699a1b5a51b67e0306ade7f087 100644 --- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H @@ -184,7 +184,7 @@ public: AddToPropertyTypes ( ParcelType, - " vector" + "{vector}" ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H index f443f14b58df0a8c7bcbaf519c78ee83695f8e67..44245693838c8d3b103114dff7fc8dbe7a3e7cba 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H @@ -272,9 +272,7 @@ public: AddToPropertyTypes ( ParcelType, - " List<scalar>" - + " List<scalar>" - + " List<Scalar>" + " scalars scalars scalars" ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 8223ce22305968085fede70029091e6978b3bb7a..fda45e5f2242fe6ac639cae1054ea94474aca68c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -226,8 +226,7 @@ public: AddToPropertyTypes ( ParcelType, - " scalar" - + " List<scalar>" + "{scalar} scalars" ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index 9178fbcd120c6a5bf4bfed46c52587b6b1b57946..9e20ea8c0c3a77a985572ff6be7a5bef8af080bf 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -282,8 +282,7 @@ public: AddToPropertyTypes ( ParcelType, - " scalar" - + " scalar" + "{scalar scalar}" ); diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H index 76210b20c0b4476a1d51ae82dfd4e11dcda37b67..c62a9924ecc142bc32b75804b453ce9bda180abe 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H +++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H @@ -201,7 +201,7 @@ public: AddToPropertyTypes ( ParcelType, - " scalar" + "{scalar" + " vector" + " scalar" + " scalar" @@ -213,7 +213,7 @@ public: + " scalar" + " scalar" + " scalar" - + " scalar" + + " scalar}" );