From 3d0ed07fffd3798a264d7dbdff8d153791a9772b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 30 Jul 2019 11:47:46 +0200 Subject: [PATCH] DEFEATURE: remove particle PropertyTypes (revert of #109) - data types were used for initial adios interface, but this proved difficult to manage and maintain. --- .../laserDTRM/DTRMParticle/DTRMParticle.H | 13 --------- .../basic/injectedParticle/injectedParticle.H | 12 +------- .../injectedParticle/injectedParticleIO.C | 2 -- src/lagrangian/basic/particle/particle.H | 8 +----- src/lagrangian/basic/particle/particleIO.C | 1 - .../basic/particle/particleMacros.H | 28 +------------------ .../CollidingParcel/CollidingParcel.H | 9 +----- .../KinematicParcel/KinematicParcel.H | 18 +----------- .../KinematicParcel/KinematicParcelIO.C | 3 -- .../Templates/MPPICParcel/MPPICParcel.H | 9 +----- .../Templates/MPPICParcel/MPPICParcelIO.C | 3 -- .../ReactingHeterogeneousParcel.H | 7 ----- .../ReactingHeterogeneousParcelIO.C | 3 -- .../ReactingMultiphaseParcel.H | 7 ----- .../ReactingMultiphaseParcelIO.C | 3 -- .../Templates/ReactingParcel/ReactingParcel.H | 7 ----- .../ReactingParcel/ReactingParcelIO.C | 3 -- .../Templates/ThermoParcel/ThermoParcel.H | 9 +----- .../Templates/ThermoParcel/ThermoParcelIO.C | 3 -- .../Templates/SprayParcel/SprayParcel.H | 21 +------------- .../Templates/SprayParcel/SprayParcelIO.C | 4 --- 21 files changed, 8 insertions(+), 165 deletions(-) diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H index f69c56134d..b10256933b 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticle.H +++ b/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 diff --git a/src/lagrangian/basic/injectedParticle/injectedParticle.H b/src/lagrangian/basic/injectedParticle/injectedParticle.H index 5c196c1b3a..b92b1625f9 100644 --- a/src/lagrangian/basic/injectedParticle/injectedParticle.H +++ b/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 diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C index 4fa325b9e4..1d0e7eac18 100644 --- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C +++ b/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 ( diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H index 4f2e52f289..ced1efa076 100644 --- a/src/lagrangian/basic/particle/particle.H +++ b/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_; diff --git a/src/lagrangian/basic/particle/particleIO.C b/src/lagrangian/basic/particle/particleIO.C index d2a6445fc4..521d888c5e 100644 --- a/src/lagrangian/basic/particle/particleIO.C +++ b/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 ( diff --git a/src/lagrangian/basic/particle/particleMacros.H b/src/lagrangian/basic/particle/particleMacros.H index 64b02cef32..efb47b9a2c 100644 --- a/src/lagrangian/basic/particle/particleMacros.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H index be681e05a6..bdd76a50fc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 31c57eeda5..ec8465483d 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C index c7921d90f6..3432ce6314 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C @@ -36,9 +36,6 @@ template Foam::string Foam::KinematicParcel::propertyList_ = Foam::KinematicParcel::propertyList(); -template -Foam::string Foam::KinematicParcel::propertyTypes_ = - Foam::KinematicParcel::propertyTypes(); template const std::size_t Foam::KinematicParcel::sizeofFields diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H index 5cc9c43c54..6376e4e2bc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C index f300d89c0c..d55dcac231 100644 --- a/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcelIO.C @@ -35,9 +35,6 @@ template Foam::string Foam::MPPICParcel::propertyList_ = Foam::MPPICParcel::propertyList(); -template -Foam::string Foam::MPPICParcel::propertyTypes_ = - Foam::MPPICParcel::propertyTypes(); template const std::size_t Foam::MPPICParcel::sizeofFields diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.H index 7e92e9d01d..c880a097d4 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C index 3465116bb8..2bcb4d72e0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingHeterogeneousParcel/ReactingHeterogeneousParcelIO.C @@ -33,9 +33,6 @@ template Foam::string Foam::ReactingHeterogeneousParcel::propertyList_ = Foam::ReactingHeterogeneousParcel::propertyList(); -template -Foam::string Foam::ReactingHeterogeneousParcel::propertyTypes_ = - Foam::ReactingHeterogeneousParcel::propertyTypes(); template const std::size_t Foam::ReactingHeterogeneousParcel::sizeofFields diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H index 99d6cda1ca..57add40dfc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C index aa75ca3794..4b55a05276 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C @@ -34,9 +34,6 @@ template Foam::string Foam::ReactingMultiphaseParcel::propertyList_ = Foam::ReactingMultiphaseParcel::propertyList(); -template -Foam::string Foam::ReactingMultiphaseParcel::propertyTypes_ = - Foam::ReactingMultiphaseParcel::propertyTypes(); template const std::size_t Foam::ReactingMultiphaseParcel::sizeofFields diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 900d1724ee..9914c531e0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C index 56ba4492b4..3225a71719 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C @@ -34,9 +34,6 @@ template Foam::string Foam::ReactingParcel::propertyList_ = Foam::ReactingParcel::propertyList(); -template -Foam::string Foam::ReactingParcel::propertyTypes_ = - Foam::ReactingParcel::propertyTypes(); template const std::size_t Foam::ReactingParcel::sizeofFields diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index f1c6d1d628..83194252e9 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/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 diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C index ee1ec281d9..1574dd5765 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C @@ -34,9 +34,6 @@ template Foam::string Foam::ThermoParcel::propertyList_ = Foam::ThermoParcel::propertyList(); -template -Foam::string Foam::ThermoParcel::propertyTypes_ = - Foam::ThermoParcel::propertyTypes(); template const std::size_t Foam::ThermoParcel::sizeofFields diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H index 938a03de3d..195283a0ed 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H +++ b/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 diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C index 5f73b9c1c0..93cf283629 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C +++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C @@ -34,10 +34,6 @@ template Foam::string Foam::SprayParcel::propertyList_ = Foam::SprayParcel::propertyList(); -template -Foam::string Foam::SprayParcel::propertyTypes_ = - Foam::SprayParcel::propertyTypes(); - template const std::size_t Foam::SprayParcel::sizeofFields