DEFEATURE: remove particle PropertyTypes (revert of #109)

- data types were used for initial adios interface, but this proved
  difficult to manage and maintain.

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H

@@ -158,22 +158,9 @@ public:
           + " transmissiveId";
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            particle,
-            "{point"
-          + " point"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " label}"
-        );
-
 
     // Constructors
 
-
         //- Construct from components, with searching for tetFace and
         //  tetPt unless disabled by doCellFacePt = false.
         DTRMParticle

src/lagrangian/basic/injectedParticle/injectedParticle.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,16 +114,6 @@ public:
           + " (Ux Uy Uz)";
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            particle,
-            "{label"
-          + " scalar"
-          + " scalar"
-          + " vector}"
-        );
-
 
     // Constructors
 

src/lagrangian/basic/injectedParticle/injectedParticleIO.C

@@ -33,8 +33,6 @@ License
 Foam::string Foam::injectedParticle::propertyList_ =
     Foam::injectedParticle::propertyList();
 
-Foam::string Foam::injectedParticle::propertyTypes_ =
-    Foam::injectedParticle::propertyTypes();
 
 const std::size_t Foam::injectedParticle::sizeofFields
 (

src/lagrangian/basic/particle/particle.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -352,12 +352,6 @@ public:
             "celli tetFacei tetPti facei stepFraction origProc origId"
         );
 
-        //- String representation of property types
-        DefinePropertyTypes
-        (
-            "{vector label label scalar label label label label}"
-        );
-
         //- Cumulative particle counter - used to provide unique ID
         static label particleCount_;
 

src/lagrangian/basic/particle/particleIO.C

@@ -31,7 +31,6 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 Foam::string Foam::particle::propertyList_  = Foam::particle::propertyList();
-Foam::string Foam::particle::propertyTypes_ = Foam::particle::propertyTypes();
 
 const std::size_t Foam::particle::sizeofPosition
 (

src/lagrangian/basic/particle/particleMacros.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2012-2016 OpenFOAM Foundation
@@ -67,32 +67,6 @@ 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)                                               \
-                                                                               \
-    static string propertyTypes_;                                              \
-                                                                               \
-    static string propertyTypes()                                              \
-    {                                                                          \
-        return str;                                                            \
-    }
-
-
-//- 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)                                    \
-                                                                               \
-    static string propertyTypes_;                                              \
-                                                                               \
-    static string propertyTypes()                                              \
-    {                                                                          \
-        return ParcelType::propertyTypes() + str;                              \
-    }
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -168,13 +168,6 @@ public:
           + " (collisionRecordsWallData)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{vector vector vector} *"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -341,22 +341,6 @@ public:
           + " (UTurbx UTurby UTurbz)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{label"
-          + " label"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " vector"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " vector}"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C

@@ -36,9 +36,6 @@ template<class ParcelType>
 Foam::string Foam::KinematicParcel<ParcelType>::propertyList_ =
     Foam::KinematicParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::KinematicParcel<ParcelType>::propertyTypes_ =
-    Foam::KinematicParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::KinematicParcel<ParcelType>::sizeofFields

src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2013-2017 OpenFOAM Foundation
@@ -182,13 +182,6 @@ public:
             " (UCorrectx UCorrecty UCorrectz)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{vector}"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C

@@ -35,9 +35,6 @@ template<class ParcelType>
 Foam::string Foam::MPPICParcel<ParcelType>::propertyList_ =
     Foam::MPPICParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::MPPICParcel<ParcelType>::propertyTypes_ =
-    Foam::MPPICParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::MPPICParcel<ParcelType>::sizeofFields

src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.H

@@ -205,13 +205,6 @@ public:
           + " nReactions(F1..FN)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            " scalars "
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C

@@ -33,9 +33,6 @@ template<class ParcelType>
 Foam::string Foam::ReactingHeterogeneousParcel<ParcelType>::propertyList_ =
     Foam::ReactingHeterogeneousParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::ReactingHeterogeneousParcel<ParcelType>::propertyTypes_ =
-    Foam::ReactingHeterogeneousParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::ReactingHeterogeneousParcel<ParcelType>::sizeofFields

src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H

@@ -275,13 +275,6 @@ public:
           + " nSolid(Y1..YN)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            " scalars scalars scalars"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C

@@ -34,9 +34,6 @@ template<class ParcelType>
 Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propertyList_ =
     Foam::ReactingMultiphaseParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propertyTypes_ =
-    Foam::ReactingMultiphaseParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::ReactingMultiphaseParcel<ParcelType>::sizeofFields

src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H

@@ -228,13 +228,6 @@ public:
           + " nPhases(Y1..YN)"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{scalar} scalars"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C

@@ -34,9 +34,6 @@ template<class ParcelType>
 Foam::string Foam::ReactingParcel<ParcelType>::propertyList_ =
     Foam::ReactingParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::ReactingParcel<ParcelType>::propertyTypes_ =
-    Foam::ReactingParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::ReactingParcel<ParcelType>::sizeofFields

src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -290,13 +290,6 @@ public:
           + " Cp"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{scalar scalar}"
-        );
-
 
     // Constructors
 

src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C

@@ -34,9 +34,6 @@ template<class ParcelType>
 Foam::string Foam::ThermoParcel<ParcelType>::propertyList_ =
     Foam::ThermoParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::ThermoParcel<ParcelType>::propertyTypes_ =
-    Foam::ThermoParcel<ParcelType>::propertyTypes();
 
 template<class ParcelType>
 const std::size_t Foam::ThermoParcel<ParcelType>::sizeofFields

src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -203,25 +203,6 @@ public:
           + " user"
         );
 
-        //- String representation of property types
-        AddToPropertyTypes
-        (
-            ParcelType,
-            "{scalar"
-          + " vector"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar"
-          + " scalar}"
-        );
-
 
     // Constructors
 

src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C

@@ -34,10 +34,6 @@ template<class ParcelType>
 Foam::string Foam::SprayParcel<ParcelType>::propertyList_ =
     Foam::SprayParcel<ParcelType>::propertyList();
 
-template<class ParcelType>
-Foam::string Foam::SprayParcel<ParcelType>::propertyTypes_ =
-    Foam::SprayParcel<ParcelType>::propertyTypes();
-
 
 template<class ParcelType>
 const std::size_t Foam::SprayParcel<ParcelType>::sizeofFields