From 43d66b5e7c566e087db187df023f134422ee8a4b Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 22 Jul 2020 11:17:16 +0100 Subject: [PATCH] lagrangian: Run-time selectable clouds The standard set of Lagrangian clouds are now selectable at run-time. This means that a solver that supports Lagrangian modelling can now use any type of cloud (with some restrictions). Previously, solvers were hard-coded to use specific cloud modelling. In addition, a cloud-list structure has been added so that solvers may select multiple clouds, rather than just one. The new system is controlled as follows: - If only a single cloud is required, then the settings for the Lagrangian modelling should be placed in a constant/cloudProperties file. - If multiple clouds are required, then a constant/clouds file should be created containing a list of cloud names defined by the user. Each named cloud then reads settings from a corresponding constant/Properties file. Clouds are evolved sequentially in the order in which they are listed in the constant/clouds file. - If no clouds are required, then the constant/cloudProperties file and constant/clouds file should be omitted. The constant/cloudProperties or constant/Properties files are the same as previous cloud properties files; e.g., constant/kinematicCloudProperties or constant/reactingCloud1Properties, except that they now also require an additional top-level "type" entry to select which type of cloud is to be used. The available options for this entry are: type cloud; // A basic cloud of solid // particles. Includes forces, // patch interaction, injection, // dispersion and stochastic // collisions. Same as the cloud // previously used by // rhoParticleFoam // (uncoupledKinematicParticleFoam) type collidingCloud; // As "cloud" but with resolved // collision modelling. Same as the // cloud previously used by DPMFoam // and particleFoam // (icoUncoupledKinematicParticleFoam) type MPPICCloud; // As "cloud" but with MPPIC // collision modelling. Same as the // cloud previously used by // MPPICFoam. type thermoCloud; // As "cloud" but with // thermodynamic modelling and heat // transfer with the carrier phase. // Same as the limestone cloud // previously used by // coalChemistryFoam. type reactingCloud; // As "thermoCloud" but with phase // change and mass transfer // coupling with the carrier // phase. Same as the cloud // previously used in fireFoam. type reactingMultiphaseCloud; // As "reactingCloud" but with // particles that contain multiple // phases. Same as the clouds // previously used in // reactingParcelFoam and // simpleReactingParcelFoam and the // coal cloud used in // coalChemistryFoam. type sprayCloud; // As "reactingCloud" but with // additional spray-specific // collision and breakup modelling. // Same as the cloud previously // used in sprayFoam and // engineFoam. The first three clouds are not thermally coupled, so are available in all Lagrangian solvers. The last four are thermally coupled and require access to the carrier thermodynamic model, so are only available in compressible Lagrangian solvers. This change has reduced the number of solvers necessary to provide the same functionality; solvers that previously differed only in their Lagrangian modelling can now be combined. The Lagrangian solvers have therefore been consolidated with consistent naming as follows. denseParticleFoam: Replaces DPMFoam and MPPICFoam reactingParticleFoam: Replaces sprayFoam and coalChemistryFoam simpleReactingParticleFoam: Replaces simpleReactingParcelFoam buoyantReactingParticleFoam: Replaces reactingParcelFoam fireFoam and engineFoam remain, although fireFoam is likely to be merged into buoyantReactingParticleFoam in the future once the additional functionality it provides is generalised. Some additional minor functionality has also been added to certain solvers: - denseParticleFoam has a "cloudForceSplit" control which can be set in system/fvOptions.PIMPLE. This provides three methods for handling the cloud momentum coupling, each of which have different trade-off-s regarding numerical artefacts in the velocity field. See denseParticleFoam.C for more information, and also bug report #3385. - reactingParticleFoam and buoyantReactingParticleFoam now support moving mesh in order to permit sharing parts of their implementation with engineFoam. --- .../XiFoam/XiEngineFoam/XiEngineFoam.C | 2 +- .../coldEngineFoam/coldEngineFoam.C | 2 +- .../solvers/combustion/fireFoam/Make/options | 6 +- .../combustion/fireFoam/createClouds.H | 11 +- .../solvers/combustion/fireFoam/fireFoam.C | 2 +- .../solvers/lagrangian/DPMFoam/DPMFoam.C | 171 -------- .../DPMMomentumTransportModels/Make/files | 3 - .../lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C | 40 -- .../lagrangian/DPMFoam/MPPICFoam/Make/files | 3 - .../solvers/lagrangian/DPMFoam/Make/files | 3 - .../solvers/lagrangian/DPMFoam/Make/options | 31 -- .../lagrangian/coalChemistryFoam/EEqn.H | 41 -- .../lagrangian/coalChemistryFoam/Make/files | 3 - .../lagrangian/coalChemistryFoam/Make/options | 49 --- .../lagrangian/coalChemistryFoam/YEqn.H | 49 --- .../coalChemistryFoam/createClouds.H | 19 - .../coalChemistryFoam/createFieldRefs.H | 1 - .../coalChemistryFoam/createFields.H | 141 ------ .../lagrangian/coalChemistryFoam/pEqn.H | 93 ---- .../lagrangian/coalChemistryFoam/rhoEqn.H | 47 -- .../lagrangian/coalChemistryFoam/setRDeltaT.H | 135 ------ .../{DPMFoam => denseParticleFoam}/Allwclean | 2 +- .../{DPMFoam => denseParticleFoam}/Allwmake | 3 +- .../CourantNo.H | 2 +- .../lagrangian/denseParticleFoam/Make/files | 3 + .../Make/options | 11 +- .../{DPMFoam => denseParticleFoam}/UcEqn.H | 16 +- .../continuityErrs.H | 2 +- .../correctPhic.H | 0 .../createFields.H | 20 +- .../createUcf.H | 2 +- .../createUcfIfPresent.H | 2 +- .../denseParticleFoam/denseParticleFoam.C | 241 +++++++++++ .../Make/files | 3 + .../Make/options | 0 .../denseParticleMomentumTransportModels.C} | 0 .../{DPMFoam => denseParticleFoam}/pEqn.H | 37 +- .../lagrangian/particleFoam/Make/options | 6 +- .../lagrangian/particleFoam/createFields.H | 14 +- .../lagrangian/particleFoam/particleFoam.C | 15 +- .../lagrangian/reactingParcelFoam/Make/files | 3 - .../reactingParcelFoam/createClouds.H | 9 - .../reactingParcelFoam/reactingParcelFoam.C | 139 ------ .../simpleReactingParcelFoam/Make/files | 3 - .../simpleReactingParcelFoam/createClouds.H | 9 - .../EEqn.H | 2 +- .../reactingParticleFoam/Make/files | 3 + .../Make/options | 12 +- .../UEqn.H | 3 +- .../YEqn.H | 3 +- .../buoyantReactingParticleFoam/Make/files | 3 + .../buoyantReactingParticleFoam}/Make/options | 36 +- .../buoyantReactingParticleFoam}/UEqn.H | 2 +- .../buoyantReactingParticleFoam.C} | 96 ++++- .../createFields.H | 11 +- .../buoyantReactingParticleFoam}/pEqn.H | 10 +- .../reactingParticleFoam/createClouds.H | 2 + .../createFieldRefs.H | 0 .../createFields.H | 68 ++- .../createSurfaceFilmModel.H | 0 .../engineFoam/Make/files | 0 .../engineFoam}/Make/options | 45 +- .../engineFoam/engineFoam.C | 100 ++++- .../engineFoam/logSummary.H | 0 .../engineFoam/startSummary.H | 0 .../lagrangian/reactingParticleFoam/pEqn.H | 90 ++++ .../reactingParticleFoam.C} | 70 +-- .../rhoEqn.H | 4 +- .../setMultiRegionDeltaT.H | 2 +- .../setRDeltaT.H | 2 +- .../lagrangian/rhoParticleFoam/Make/options | 6 +- .../lagrangian/rhoParticleFoam/createFields.H | 16 +- .../rhoParticleFoam/rhoParticleFoam.C | 14 +- .../EEqn.H | 2 +- .../simpleReactingParticleFoam/Make/files | 3 + .../Make/options | 10 +- .../UEqn.H | 2 +- .../YEqn.H | 2 +- .../simpleReactingParticleFoam/createClouds.H | 2 + .../createFieldRefs.H | 2 +- .../createFields.H | 0 .../pEqn.H | 2 +- .../simpleReactingParticleFoam.C} | 6 +- .../solvers/lagrangian/sprayFoam/EEqn.H | 40 -- .../solvers/lagrangian/sprayFoam/Make/files | 3 - .../solvers/lagrangian/sprayFoam/UEqn.H | 27 -- .../solvers/lagrangian/sprayFoam/YEqn.H | 48 --- .../lagrangian/sprayFoam/createClouds.H | 9 - .../solvers/lagrangian/sprayFoam/pEqn.H | 119 ----- .../solvers/lagrangian/sprayFoam/rhoEqn.H | 47 -- applications/test/Function1/Make/options | 14 - bin/DPMFoam | 58 +++ bin/MPPICFoam | 58 +++ bin/coalChemistryFoam | 57 +++ bin/reactingParcelFoam | 58 +++ bin/simpleReactingParcelFoam | 58 +++ bin/sprayFoam | 57 +++ .../solvers/particles/particles | 5 +- ...nematicCloudProperties => cloudProperties} | 2 +- src/OpenFOAM/include/macros.H | 6 +- src/engine/include/createEngineControls.H | 3 + src/engine/include/createEngineTimeControls.H | 3 + src/engine/include/readEngineControls.H | 3 + src/engine/include/readEngineTimeControls.H | 2 +- src/functionObjects/field/Make/files | 1 - .../streamLine/streamLineParticleCloud.C | 4 +- .../streamLine/streamLineParticleCloud.H | 7 +- src/functionObjects/lagrangian/Make/options | 6 +- .../lagrangian/cloudInfo/cloudInfo.C | 7 +- .../lagrangian/cloudInfo/cloudInfo.H | 4 +- .../lagrangian/particles/particles.C | 22 +- .../lagrangian/particles/particles.H | 29 +- src/lagrangian/Allwmake | 6 +- src/lagrangian/DSMC/Make/files | 4 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 6 +- .../clouds/Templates/DSMCCloud/DSMCCloud.H | 12 +- .../Templates/DSMCCloud/DSMCCloudName.C} | 9 +- .../derived/dsmcParcel/defineDSMCParcel.C | 4 +- src/lagrangian/basic/Cloud/Cloud.H | 5 +- .../indexedParticle/indexedParticleCloud.C | 4 +- .../indexedParticle/indexedParticleCloud.H | 6 +- .../passiveParticle/passiveParticleCloud.C | 4 +- .../passiveParticle/passiveParticleCloud.H | 6 +- src/lagrangian/coalCombustion/Make/files | 5 - src/lagrangian/coalCombustion/Make/options | 39 -- .../coalCloudList/coalCloudList.C | 92 ---- .../coalCloudList/coalCloudList.H | 124 ------ .../coalCloudList/coalCloudListI.H | 227 ---------- .../kinematicCloud/kinematicCloud.H | 126 ------ .../baseClasses/reactingCloud/reactingCloud.H | 84 ---- .../reactingMultiphaseCloud.H | 84 ---- .../baseClasses/thermoCloud/thermoCloud.H | 96 ----- .../basicKinematicCollidingCloud.H | 60 --- .../defineBasicKinematicCollidingParcel.C | 38 -- .../defineBasicKinematicMPPICParcel.C | 38 -- .../defineBasicKinematicParcel.C | 38 -- .../basicReactingMultiphaseParcel.H | 76 ---- .../defineBasicReactingMultiphaseParcel.C | 38 -- .../defineBasicReactingParcel.C | 38 -- .../defineBasicThermoParcel.C | 37 -- ...ingMultiphaseParcelSurfaceReactionModels.H | 45 -- .../molecule/moleculeCloud/moleculeCloud.C | 2 +- .../molecule/moleculeCloud/moleculeCloud.H | 6 +- .../{intermediate => parcel}/Make/files | 100 ++--- .../{intermediate => parcel}/Make/options | 0 .../Templates/CollidingCloud/CollidingCloud.C | 21 +- .../Templates/CollidingCloud/CollidingCloud.H | 40 +- .../CollidingCloud/CollidingCloudI.H | 2 +- .../CollidingCloud/CollidingCloudName.C | 36 ++ .../clouds/Templates/MPPICCloud/MPPICCloud.C | 21 +- .../clouds/Templates/MPPICCloud/MPPICCloud.H | 40 +- .../clouds/Templates/MPPICCloud/MPPICCloudI.H | 2 +- .../Templates/MPPICCloud/MPPICCloudName.C | 36 ++ .../Templates/MomentumCloud/MomentumCloud.C} | 147 ++++--- .../Templates/MomentumCloud/MomentumCloud.H} | 136 +++--- .../Templates/MomentumCloud/MomentumCloudI.H} | 186 ++++---- .../MomentumCloud/MomentumCloudName.C | 36 ++ .../cloudSolution/cloudSolution.C | 2 +- .../cloudSolution/cloudSolution.H | 2 +- .../cloudSolution/cloudSolutionI.H | 2 +- .../Templates/ReactingCloud/ReactingCloud.C | 12 +- .../Templates/ReactingCloud/ReactingCloud.H | 23 +- .../Templates/ReactingCloud/ReactingCloudI.H | 4 +- .../ReactingCloud/ReactingCloudName.C | 36 ++ .../ReactingMultiphaseCloud.C | 7 +- .../ReactingMultiphaseCloud.H | 24 +- .../ReactingMultiphaseCloudI.H | 2 +- .../ReactingMultiphaseCloudName.C | 36 ++ .../clouds/Templates/SprayCloud/SprayCloud.C | 5 +- .../clouds/Templates/SprayCloud/SprayCloud.H | 19 +- .../clouds/Templates/SprayCloud/SprayCloudI.H | 4 +- .../Templates/SprayCloud/SprayCloudName.C | 36 ++ .../Templates/ThermoCloud/ThermoCloud.C | 23 +- .../Templates/ThermoCloud/ThermoCloud.H | 43 +- .../Templates/ThermoCloud/ThermoCloudI.H | 27 +- .../Templates/ThermoCloud/ThermoCloudName.C | 36 ++ .../derived/collidingCloud/collidingCloud.C} | 33 +- .../derived/collidingCloud/collidingCloud.H} | 32 +- .../derived/momentumCloud/momentumCloud.C} | 32 +- .../derived/momentumCloud/momentumCloud.H} | 28 +- .../clouds/derived/mppicCloud/mppicCloud.C | 50 +++ .../clouds/derived/mppicCloud/mppicCloud.H} | 30 +- .../derived}/reactingCloud/reactingCloud.C | 23 +- .../derived/reactingCloud/reactingCloud.H} | 28 +- .../reactingMultiphaseCloud.C | 23 +- .../reactingMultiphaseCloud.H} | 32 +- .../clouds/derived}/sprayCloud/sprayCloud.C | 23 +- .../clouds/derived/sprayCloud/sprayCloud.H} | 32 +- .../clouds/derived}/thermoCloud/thermoCloud.C | 23 +- .../clouds/derived/thermoCloud/thermoCloud.H} | 26 +- .../integrationScheme/Euler/Euler.C | 2 +- .../integrationScheme/Euler/Euler.H | 2 +- .../integrationScheme/analytical/analytical.C | 2 +- .../integrationScheme/analytical/analytical.H | 2 +- .../integrationScheme/integrationScheme.C | 2 +- .../integrationScheme/integrationScheme.H | 2 +- .../integrationScheme/integrationSchemeNew.C | 2 +- .../integrationSchemeTemplates.C | 2 +- .../parcelCloud/ParcelCloud.H} | 55 +-- .../parcel/parcelCloud/ParcelCloudBase.H | 299 +++++++++++++ .../parcelCloud/parcelCloud.C} | 14 +- .../parcel/parcelCloud/parcelCloud.H | 162 +++++++ .../parcelCloud/parcelCloudBase.C} | 10 +- .../parcel/parcelCloud/parcelCloudBase.H | 181 ++++++++ .../parcel/parcelCloud/parcelCloudNew.C | 112 +++++ .../parcel/parcelCloudList/parcelCloudList.C | 408 ++++++++++++++++++ .../parcel/parcelCloudList/parcelCloudList.H | 199 +++++++++ .../CollidingParcel/CollidingParcel.C | 0 .../CollidingParcel/CollidingParcel.H | 16 +- .../CollidingParcel/CollidingParcelI.H | 2 +- .../CollidingParcel/CollidingParcelIO.C | 2 +- .../CollidingParcel/CollidingParcelName.C | 37 ++ .../CollidingParcelTrackingDataI.H | 0 .../CollisionRecordList/CollisionRecordList.C | 2 +- .../CollisionRecordList/CollisionRecordList.H | 2 +- .../CollisionRecordListI.H | 2 +- .../PairCollisionRecord/PairCollisionRecord.C | 2 +- .../PairCollisionRecord/PairCollisionRecord.H | 2 +- .../PairCollisionRecordI.H | 2 +- .../PairCollisionRecordIO.C | 2 +- .../WallCollisionRecord/WallCollisionRecord.C | 2 +- .../WallCollisionRecord/WallCollisionRecord.H | 2 +- .../WallCollisionRecordI.H | 2 +- .../WallCollisionRecordIO.C | 2 +- .../Templates/MPPICParcel/MPPICParcel.C | 0 .../Templates/MPPICParcel/MPPICParcel.H | 15 +- .../Templates/MPPICParcel/MPPICParcelI.H | 2 +- .../Templates/MPPICParcel/MPPICParcelIO.C | 2 +- .../Templates/MPPICParcel/MPPICParcelName.C | 37 ++ .../MPPICParcel/MPPICParcelTrackingDataI.H | 0 .../MomentumParcel/MomentumParcel.C} | 40 +- .../MomentumParcel/MomentumParcel.H} | 69 +-- .../MomentumParcel/MomentumParcelI.H} | 96 ++--- .../MomentumParcel/MomentumParcelIO.C} | 32 +- .../MomentumParcel/MomentumParcelName.C | 37 ++ .../MomentumParcelTrackingDataI.H} | 22 +- .../ReactingMultiphaseParcel.C | 31 +- .../ReactingMultiphaseParcel.H | 15 +- .../ReactingMultiphaseParcelI.H | 2 +- .../ReactingMultiphaseParcelIO.C | 2 +- .../ReactingMultiphaseParcelName.C | 38 ++ .../Templates/ReactingParcel/ReactingParcel.C | 22 +- .../Templates/ReactingParcel/ReactingParcel.H | 14 +- .../ReactingParcel/ReactingParcelI.H | 2 +- .../ReactingParcel/ReactingParcelIO.C | 2 +- .../ReactingParcel/ReactingParcelName.C | 38 ++ .../ReactingParcelTrackingDataI.H | 0 .../Templates/SprayParcel/SprayParcel.C | 3 +- .../Templates/SprayParcel/SprayParcel.H | 19 +- .../Templates/SprayParcel/SprayParcelI.H | 2 +- .../Templates/SprayParcel/SprayParcelIO.C | 2 +- .../Templates/SprayParcel/SprayParcelName.C | 37 ++ .../Templates/ThermoParcel/ThermoParcel.C | 14 +- .../Templates/ThermoParcel/ThermoParcel.H | 18 +- .../Templates/ThermoParcel/ThermoParcelI.H | 2 +- .../Templates/ThermoParcel/ThermoParcelIO.C | 2 +- .../Templates/ThermoParcel/ThermoParcelName.C | 38 ++ .../ThermoParcel/ThermoParcelTrackingDataI.H | 0 .../collidingParcel/collidingParcel.H} | 21 +- .../makeCollidingParcelSubmodels.C} | 24 +- .../makeMomentumParcelSubmodels.C} | 22 +- .../derived/momentumParcel/momentumParcel.H} | 18 +- .../mppicParcel/makeMppicParcelSubmodels.C} | 28 +- .../derived/mppicParcel/mppicParcel.H} | 18 +- .../makeReactingMultiphaseParcelSubmodels.C} | 32 +- .../reactingMultiphaseParcel.H} | 22 +- .../makeReactingParcelSubmodels.C} | 28 +- .../derived/reactingParcel/reactingParcel.H} | 20 +- .../sprayParcel/makeSprayParcelSubmodels.C} | 38 +- .../derived/sprayParcel/sprayParcel.H} | 20 +- .../thermoParcel/makeThermoParcelSubmodels.C} | 24 +- .../derived/thermoParcel/thermoParcel.H} | 18 +- .../include/makeMPPICParcelDampingModels.H | 2 +- .../include/makeMPPICParcelIsotropyModels.H | 2 +- .../include/makeMPPICParcelPackingModels.H | 2 +- .../include/makeParcelCloudFunctionObjects.H | 2 +- .../include/makeParcelCollisionModels.H | 2 +- .../include/makeParcelDispersionModels.H | 2 +- .../parcels/include/makeParcelForces.H | 2 +- .../include/makeParcelHeatTransferModels.H | 2 +- .../include/makeParcelInjectionModels.H | 6 +- .../makeParcelPatchInteractionModels.H | 2 +- .../makeParcelStochasticCollisionModels.H | 2 +- .../include/makeParcelSurfaceFilmModels.H | 2 +- ...eactingMultiphaseParcelCompositionModels.H | 2 +- ...ngMultiphaseParcelDevolatilisationModels.H | 2 +- ...eReactingMultiphaseParcelInjectionModels.H | 2 +- ...ultiphaseParcelStochasticCollisionModels.H | 2 +- ...ngMultiphaseParcelSurfaceReactionModels.H} | 12 +- .../makeReactingParcelCompositionModels.H | 2 +- .../makeReactingParcelInjectionModels.H | 2 +- .../makeReactingParcelPhaseChangeModels.H | 2 +- .../makeReactingParcelSurfaceFilmModels.H | 2 +- .../makeSprayParcelAtomizationModels.H | 2 +- .../include/makeSprayParcelBreakupModels.H | 2 +- .../include/makeSprayParcelInjectionModels.H | 2 +- ...makeSprayParcelStochasticCollisionModels.H | 2 +- .../makeThermoParcelSurfaceFilmModels.H | 2 +- .../phaseProperties/phaseProperties.C | 2 +- .../phaseProperties/phaseProperties.H | 2 +- .../phaseProperties/phasePropertiesIO.C | 2 +- .../phasePropertiesList/phasePropertiesList.C | 2 +- .../phasePropertiesList/phasePropertiesList.H | 2 +- .../CloudFunctionObject/CloudFunctionObject.C | 2 +- .../CloudFunctionObject/CloudFunctionObject.H | 18 +- .../CloudFunctionObjectNew.C | 2 +- .../CloudFunctionObjectList.C | 2 +- .../CloudFunctionObjectList.H | 2 +- .../CloudFunctionObjectListI.H | 2 +- .../FacePostProcessing/FacePostProcessing.C | 0 .../FacePostProcessing/FacePostProcessing.H | 2 +- .../FacePostProcessing/FacePostProcessingI.H | 2 +- .../ParticleCollector/ParticleCollector.C | 0 .../ParticleCollector/ParticleCollector.H | 2 +- .../ParticleCollector/ParticleCollectorI.H | 2 +- .../ParticleErosion/ParticleErosion.C | 2 +- .../ParticleErosion/ParticleErosion.H | 2 +- .../ParticleTracks/ParticleTracks.C | 2 +- .../ParticleTracks/ParticleTracks.H | 2 +- .../ParticleTracks/ParticleTracksI.H | 2 +- .../ParticleTrap/ParticleTrap.C | 2 +- .../ParticleTrap/ParticleTrap.H | 2 +- .../PatchCollisionDensity.C | 2 +- .../PatchCollisionDensity.H | 2 +- .../PatchPostProcessing/PatchPostProcessing.C | 2 +- .../PatchPostProcessing/PatchPostProcessing.H | 2 +- .../PatchPostProcessingI.H | 2 +- .../RelativeVelocity/RelativeVelocity.C | 2 +- .../RelativeVelocity/RelativeVelocity.H | 2 +- .../VoidFraction/VoidFraction.C | 2 +- .../VoidFraction/VoidFraction.H | 2 +- .../submodels/CloudSubModelBase.C | 2 +- .../submodels/CloudSubModelBase.H | 2 +- .../ParticleForceList/ParticleForceList.C | 2 +- .../ParticleForceList/ParticleForceList.H | 2 +- .../ParticleForceList/ParticleForceListI.H | 2 +- .../AveragingMethod/AveragingMethod.C | 6 +- .../AveragingMethod/AveragingMethod.H | 7 +- .../AveragingMethod/AveragingMethodI.H | 2 +- .../MPPIC/AveragingMethods/Basic/Basic.C | 2 +- .../MPPIC/AveragingMethods/Basic/Basic.H | 0 .../MPPIC/AveragingMethods/Dual/Dual.C | 2 +- .../MPPIC/AveragingMethods/Dual/Dual.H | 0 .../MPPIC/AveragingMethods/Moment/Moment.C | 2 +- .../MPPIC/AveragingMethods/Moment/Moment.H | 0 .../AveragingMethods/makeAveragingMethods.C | 2 +- .../CorrectionLimitingMethod.C | 2 +- .../CorrectionLimitingMethod.H | 2 +- .../absolute/absolute.C | 2 +- .../absolute/absolute.H | 2 +- .../noCorrectionLimiting.C | 2 +- .../noCorrectionLimiting.H | 2 +- .../relative/relative.C | 2 +- .../relative/relative.H | 2 +- .../DampingModels/DampingModel/DampingModel.C | 2 +- .../DampingModels/DampingModel/DampingModel.H | 2 +- .../MPPIC/DampingModels/NoDamping/NoDamping.C | 2 +- .../MPPIC/DampingModels/NoDamping/NoDamping.H | 2 +- .../DampingModels/Relaxation/Relaxation.C | 2 +- .../DampingModels/Relaxation/Relaxation.H | 2 +- .../IsotropyModel/IsotropyModel.C | 2 +- .../IsotropyModel/IsotropyModel.H | 2 +- .../IsotropyModels/NoIsotropy/NoIsotropy.C | 2 +- .../IsotropyModels/NoIsotropy/NoIsotropy.H | 2 +- .../IsotropyModels/Stochastic/Stochastic.C | 2 +- .../IsotropyModels/Stochastic/Stochastic.H | 2 +- .../MPPIC/PackingModels/Explicit/Explicit.C | 2 +- .../MPPIC/PackingModels/Explicit/Explicit.H | 2 +- .../MPPIC/PackingModels/Implicit/Implicit.C | 2 +- .../MPPIC/PackingModels/Implicit/Implicit.H | 2 +- .../MPPIC/PackingModels/NoPacking/NoPacking.C | 2 +- .../MPPIC/PackingModels/NoPacking/NoPacking.H | 2 +- .../PackingModels/PackingModel/PackingModel.C | 2 +- .../PackingModels/PackingModel/PackingModel.H | 2 +- .../HarrisCrighton/HarrisCrighton.C | 2 +- .../HarrisCrighton/HarrisCrighton.H | 2 +- .../MPPIC/ParticleStressModels/Lun/Lun.C | 2 +- .../MPPIC/ParticleStressModels/Lun/Lun.H | 2 +- .../ParticleStressModel/ParticleStressModel.C | 2 +- .../ParticleStressModel/ParticleStressModel.H | 0 .../exponential/exponential.C | 2 +- .../exponential/exponential.H | 2 +- .../TimeScaleModel/TimeScaleModel.C | 2 +- .../TimeScaleModel/TimeScaleModel.H | 0 .../TimeScaleModels/equilibrium/equilibrium.C | 2 +- .../TimeScaleModels/equilibrium/equilibrium.H | 2 +- .../TimeScaleModels/isotropic/isotropic.C | 4 +- .../TimeScaleModels/isotropic/isotropic.H | 2 +- .../nonEquilibrium/nonEquilibrium.C | 2 +- .../nonEquilibrium/nonEquilibrium.H | 2 +- .../CollisionModel/CollisionModel.C | 2 +- .../CollisionModel/CollisionModel.H | 2 +- .../CollisionModel/CollisionModelNew.C | 2 +- .../CollisionModel/NoCollision/NoCollision.C | 2 +- .../CollisionModel/NoCollision/NoCollision.H | 2 +- .../PairCollision/PairCollision.C | 2 +- .../PairCollision/PairCollision.H | 2 +- .../PairModel/PairModel/PairModel.C | 2 +- .../PairModel/PairModel/PairModel.H | 20 +- .../PairModel/PairModel/PairModelNew.C | 2 +- .../PairSpringSliderDashpot.C | 2 +- .../PairSpringSliderDashpot.H | 2 +- .../WallLocalSpringSliderDashpot.C | 2 +- .../WallLocalSpringSliderDashpot.H | 2 +- .../WallModel/WallModel/WallModel.C | 2 +- .../WallModel/WallModel/WallModel.H | 22 +- .../WallModel/WallModel/WallModelNew.C | 2 +- .../WallSpringSliderDashpot.C | 2 +- .../WallSpringSliderDashpot.H | 2 +- .../PairCollision/WallSiteData/WallSiteData.C | 2 +- .../PairCollision/WallSiteData/WallSiteData.H | 2 +- .../WallSiteData/WallSiteDataI.H | 2 +- .../DispersionModel/DispersionModel.C | 2 +- .../DispersionModel/DispersionModel.H | 18 +- .../DispersionModel/DispersionModelNew.C | 2 +- .../NoDispersion/NoDispersion.C | 2 +- .../NoDispersion/NoDispersion.H | 2 +- .../CellZoneInjection/CellZoneInjection.C | 0 .../CellZoneInjection/CellZoneInjection.H | 2 +- .../ConeInjection/ConeInjection.C | 2 +- .../ConeInjection/ConeInjection.H | 2 +- .../FieldActivatedInjection.C | 2 +- .../FieldActivatedInjection.H | 2 +- .../InflationInjection/InflationInjection.C | 2 +- .../InflationInjection/InflationInjection.H | 2 +- .../InjectionModel/InjectionModel.C | 2 +- .../InjectionModel/InjectionModel.H | 18 +- .../InjectionModel/InjectionModelI.H | 2 +- .../InjectionModel/InjectionModelList.C | 2 +- .../InjectionModel/InjectionModelList.H | 2 +- .../InjectionModel/InjectionModelNew.C | 2 +- .../ManualInjection/ManualInjection.C | 2 +- .../ManualInjection/ManualInjection.H | 2 +- .../MomentumLookupTableInjection.C} | 28 +- .../MomentumLookupTableInjection.H} | 32 +- .../momentumParcelInjectionData.C} | 12 +- .../momentumParcelInjectionData.H} | 46 +- .../momentumParcelInjectionDataI.H} | 24 +- .../momentumParcelInjectionDataIO.C} | 14 +- .../momentumParcelInjectionDataIOList.C} | 4 +- .../momentumParcelInjectionDataIOList.H} | 14 +- .../InjectionModel/NoInjection/NoInjection.C | 2 +- .../InjectionModel/NoInjection/NoInjection.H | 2 +- .../PatchFlowRateInjection.C | 2 +- .../PatchFlowRateInjection.H | 2 +- .../PatchInjection/PatchInjection.C | 2 +- .../PatchInjection/PatchInjection.H | 2 +- .../PatchInjection/patchInjectionBase.C | 0 .../PatchInjection/patchInjectionBase.H | 2 +- .../Drag/DenseDrag/DenseDragForce.C | 2 +- .../Drag/DenseDrag/DenseDragForce.H | 2 +- .../DistortedSphereDragForce.C | 2 +- .../DistortedSphereDragForce.H | 2 +- .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C | 2 +- .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H | 2 +- .../Drag/NonSphereDrag/NonSphereDragForce.C | 2 +- .../Drag/NonSphereDrag/NonSphereDragForce.H | 2 +- .../PlessisMasliyahDragForce.C | 2 +- .../PlessisMasliyahDragForce.H | 2 +- .../SchillerNaumannDragForce.C | 2 +- .../SchillerNaumannDragForce.H | 2 +- .../Drag/SphereDrag/SphereDragForce.C | 2 +- .../Drag/SphereDrag/SphereDragForce.H | 2 +- .../Drag/WenYuDrag/WenYuDragForce.C | 2 +- .../Drag/WenYuDrag/WenYuDragForce.H | 2 +- .../ParticleForces/Gravity/GravityForce.C | 2 +- .../ParticleForces/Gravity/GravityForce.H | 2 +- .../ParticleForces/Gravity/GravityForceI.H | 2 +- .../ParticleForces/Lift/LiftForce/LiftForce.C | 2 +- .../ParticleForces/Lift/LiftForce/LiftForce.H | 2 +- .../Lift/LiftForce/LiftForceI.H | 2 +- .../Lift/SaffmanMeiLift/SaffmanMeiLiftForce.C | 2 +- .../Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H | 2 +- .../Lift/TomiyamaLift/TomiyamaLiftForce.C | 2 +- .../Lift/TomiyamaLift/TomiyamaLiftForce.H | 2 +- .../NonInertialFrame/NonInertialFrameForce.C | 2 +- .../NonInertialFrame/NonInertialFrameForce.H | 2 +- .../NonInertialFrame/NonInertialFrameForceI.H | 2 +- .../Paramagnetic/ParamagneticForce.C | 2 +- .../Paramagnetic/ParamagneticForce.H | 2 +- .../Paramagnetic/ParamagneticForceI.H | 2 +- .../ParticleForce/ParticleForce.C | 2 +- .../ParticleForce/ParticleForce.H | 18 +- .../ParticleForce/ParticleForceI.H | 2 +- .../ParticleForce/ParticleForceNew.C | 2 +- .../PressureGradient/PressureGradientForce.C | 2 +- .../PressureGradient/PressureGradientForce.H | 2 +- .../PressureGradient/PressureGradientForceI.H | 2 +- .../Momentum}/ParticleForces/SRF/SRFForce.C | 2 +- .../Momentum}/ParticleForces/SRF/SRFForce.H | 2 +- .../ParticleForces/Scaled/ScaledForce.C | 2 +- .../ParticleForces/Scaled/ScaledForce.H | 2 +- .../VirtualMass/VirtualMassForce.C | 2 +- .../VirtualMass/VirtualMassForce.H | 2 +- .../ParticleForces/forceSuSp/forceSuSp.H | 2 +- .../ParticleForces/forceSuSp/forceSuSpI.H | 2 +- .../LocalInteraction/LocalInteraction.C | 2 +- .../LocalInteraction/LocalInteraction.H | 2 +- .../LocalInteraction/patchInteractionData.C | 2 +- .../LocalInteraction/patchInteractionData.H | 2 +- .../patchInteractionDataList.C | 2 +- .../patchInteractionDataList.H | 2 +- .../NoInteraction/NoInteraction.C | 2 +- .../NoInteraction/NoInteraction.H | 2 +- .../PatchInteractionModel.C | 2 +- .../PatchInteractionModel.H | 18 +- .../PatchInteractionModelNew.C | 2 +- .../PatchInteractionModel/Rebound/Rebound.C | 2 +- .../PatchInteractionModel/Rebound/Rebound.H | 2 +- .../StandardWallInteraction.C | 2 +- .../StandardWallInteraction.H | 2 +- .../NoStochasticCollision.C | 2 +- .../NoStochasticCollision.H | 2 +- .../StochasticCollisionModel.C | 2 +- .../StochasticCollisionModel.H | 18 +- .../StochasticCollisionModelNew.C | 2 +- .../NoSurfaceFilm/NoSurfaceFilm.C | 2 +- .../NoSurfaceFilm/NoSurfaceFilm.H | 2 +- .../SurfaceFilmModel/SurfaceFilmModel.C | 0 .../SurfaceFilmModel/SurfaceFilmModel.H | 18 +- .../SurfaceFilmModel/SurfaceFilmModelI.H | 2 +- .../SurfaceFilmModel/SurfaceFilmModelNew.C | 2 +- .../CompositionModel/CompositionModel.C | 0 .../CompositionModel/CompositionModel.H | 2 +- .../CompositionModel/CompositionModelNew.C | 2 +- .../NoComposition/NoComposition.C | 2 +- .../NoComposition/NoComposition.H | 2 +- .../SingleMixtureFraction.C | 2 +- .../SingleMixtureFraction.H | 2 +- .../SinglePhaseMixture/SinglePhaseMixture.C | 2 +- .../SinglePhaseMixture/SinglePhaseMixture.H | 2 +- .../ReactingLookupTableInjection.C | 2 +- .../ReactingLookupTableInjection.H | 2 +- .../reactingParcelInjectionData.C | 2 +- .../reactingParcelInjectionData.H | 2 +- .../reactingParcelInjectionDataI.H | 2 +- .../reactingParcelInjectionDataIO.C | 2 +- .../reactingParcelInjectionDataIOList.C | 0 .../reactingParcelInjectionDataIOList.H | 0 .../LiquidEvaporation/LiquidEvaporation.C | 2 +- .../LiquidEvaporation/LiquidEvaporation.H | 2 +- .../LiquidEvaporationBoil.C | 2 +- .../LiquidEvaporationBoil.H | 2 +- .../NoPhaseChange/NoPhaseChange.C | 2 +- .../NoPhaseChange/NoPhaseChange.H | 2 +- .../PhaseChangeModel/PhaseChangeModel.C | 2 +- .../PhaseChangeModel/PhaseChangeModel.H | 2 +- .../PhaseChangeModel/PhaseChangeModelNew.C | 2 +- .../ConstantRateDevolatilisation.C | 2 +- .../ConstantRateDevolatilisation.H | 2 +- .../DevolatilisationModel.C | 2 +- .../DevolatilisationModel.H | 2 +- .../DevolatilisationModelNew.C | 2 +- .../NoDevolatilisation/NoDevolatilisation.C | 2 +- .../NoDevolatilisation/NoDevolatilisation.H | 2 +- .../SingleKineticRateDevolatilisation.C | 2 +- .../SingleKineticRateDevolatilisation.H | 2 +- .../ReactingMultiphaseLookupTableInjection.C | 2 +- .../ReactingMultiphaseLookupTableInjection.H | 2 +- .../reactingMultiphaseParcelInjectionData.C | 2 +- .../reactingMultiphaseParcelInjectionData.H | 2 +- .../reactingMultiphaseParcelInjectionDataI.H | 2 +- .../reactingMultiphaseParcelInjectionDataIO.C | 2 +- ...ctingMultiphaseParcelInjectionDataIOList.C | 0 ...ctingMultiphaseParcelInjectionDataIOList.H | 0 .../SuppressionCollision.C | 8 +- .../SuppressionCollision.H | 2 +- .../COxidationDiffusionLimitedRate.C | 0 .../COxidationDiffusionLimitedRate.H | 2 +- .../COxidationHurtMitchell.C | 0 .../COxidationHurtMitchell.H | 2 +- .../COxidationIntrinsicRate.C | 0 .../COxidationIntrinsicRate.H | 2 +- .../COxidationKineticDiffusionLimitedRate.C | 0 .../COxidationKineticDiffusionLimitedRate.H | 2 +- .../COxidationMurphyShaddix.C | 0 .../COxidationMurphyShaddix.H | 2 +- .../NoSurfaceReaction/NoSurfaceReaction.C | 2 +- .../NoSurfaceReaction/NoSurfaceReaction.H | 2 +- .../SurfaceReactionModel.C | 2 +- .../SurfaceReactionModel.H | 2 +- .../SurfaceReactionModelNew.C | 2 +- .../AtomizationModel/AtomizationModel.C | 2 +- .../AtomizationModel/AtomizationModel.H | 2 +- .../AtomizationModel/AtomizationModelNew.C | 2 +- .../BlobsSheetAtomization.C | 2 +- .../BlobsSheetAtomization.H | 2 +- .../LISAAtomization/LISAAtomization.C | 2 +- .../LISAAtomization/LISAAtomization.H | 2 +- .../LISAAtomization/LISASMDCalcMethod1.H | 0 .../LISAAtomization/LISASMDCalcMethod2.H | 0 .../NoAtomization/NoAtomization.C | 2 +- .../NoAtomization/NoAtomization.H | 2 +- .../BreakupModel/BreakupModel/BreakupModel.C | 2 +- .../BreakupModel/BreakupModel/BreakupModel.H | 2 +- .../BreakupModel/BreakupModelNew.C | 2 +- .../submodels/Spray}/BreakupModel/ETAB/ETAB.C | 2 +- .../submodels/Spray}/BreakupModel/ETAB/ETAB.H | 2 +- .../Spray}/BreakupModel/NoBreakup/NoBreakup.C | 2 +- .../Spray}/BreakupModel/NoBreakup/NoBreakup.H | 2 +- .../BreakupModel/PilchErdman/PilchErdman.C | 2 +- .../BreakupModel/PilchErdman/PilchErdman.H | 2 +- .../BreakupModel/ReitzDiwakar/ReitzDiwakar.C | 2 +- .../BreakupModel/ReitzDiwakar/ReitzDiwakar.H | 2 +- .../Spray}/BreakupModel/ReitzKHRT/ReitzKHRT.C | 2 +- .../Spray}/BreakupModel/ReitzKHRT/ReitzKHRT.H | 2 +- .../submodels/Spray}/BreakupModel/SHF/SHF.C | 0 .../submodels/Spray}/BreakupModel/SHF/SHF.H | 2 +- .../submodels/Spray}/BreakupModel/TAB/TAB.C | 2 +- .../submodels/Spray}/BreakupModel/TAB/TAB.H | 2 +- .../BreakupModel/TAB/TABSMDCalcMethod1.H | 0 .../BreakupModel/TAB/TABSMDCalcMethod2.H | 0 .../ORourkeCollision/ORourkeCollision.C | 2 +- .../ORourkeCollision/ORourkeCollision.H | 2 +- .../TrajectoryCollision/TrajectoryCollision.C | 2 +- .../TrajectoryCollision/TrajectoryCollision.H | 2 +- .../HeatTransferModel/HeatTransferModel.C | 2 +- .../HeatTransferModel/HeatTransferModel.H | 2 +- .../HeatTransferModel/HeatTransferModelNew.C | 2 +- .../NoHeatTransfer/NoHeatTransfer.C | 2 +- .../NoHeatTransfer/NoHeatTransfer.H | 2 +- .../RanzMarshall/RanzMarshall.C | 2 +- .../RanzMarshall/RanzMarshall.H | 2 +- .../ThermoLookupTableInjection.C | 2 +- .../ThermoLookupTableInjection.H | 6 +- .../thermoParcelInjectionData.C | 6 +- .../thermoParcelInjectionData.H | 6 +- .../thermoParcelInjectionDataI.H | 2 +- .../thermoParcelInjectionDataIO.C | 8 +- .../thermoParcelInjectionDataIOList.C | 0 .../thermoParcelInjectionDataIOList.H | 0 .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 2 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 2 +- .../cloudAbsorptionEmission.C | 20 +- .../cloudAbsorptionEmission.H | 2 +- .../scatter/cloudScatter/cloudScatter.C | 10 +- .../scatter/cloudScatter/cloudScatter.H | 2 +- src/lagrangian/parcelTurbulence/Make/files | 13 + .../Make/options | 4 +- .../makeCollidingParcelSubmodels.C} | 6 +- .../makeMomentumParcelSubmodels.C} | 6 +- .../mppicParcel/makeMppicParcelSubmodels.C} | 6 +- .../makeReactingMultiphaseParcelSubmodels.C} | 8 +- .../makeReactingParcelSubmodels.C} | 8 +- .../sprayParcel/makeSprayParcelSubmodels.C} | 8 +- .../thermoParcel/makeThermoParcelSubmodels.C | 40 ++ .../makeParcelTurbulenceDispersionModels.H | 6 +- .../makeThermoParcelTurbulenceForces.H | 2 +- .../DispersionRASModel/DispersionRASModel.C | 0 .../DispersionRASModel/DispersionRASModel.H | 2 +- .../GradientDispersionRAS.C | 2 +- .../GradientDispersionRAS.H | 2 +- .../StochasticDispersionRAS.C | 2 +- .../StochasticDispersionRAS.H | 2 +- .../BrownianMotion/BrownianMotionForce.C | 0 .../BrownianMotion/BrownianMotionForce.H | 2 +- .../BrownianMotion/BrownianMotionForceI.H | 2 +- src/lagrangian/solidParticle/solidParticle.C | 3 +- src/lagrangian/solidParticle/solidParticle.H | 4 + .../solidParticle/solidParticleCloud.C | 10 +- .../solidParticle/solidParticleCloud.H | 6 +- src/lagrangian/spray/Make/files | 7 - src/lagrangian/spray/Make/options | 42 -- .../baseClasses/sprayCloud/sprayCloud.H | 84 ---- .../basicSprayParcel/defineBasicSprayParcel.C | 38 -- src/lagrangian/turbulence/Make/files | 22 - src/mesh/snappyHexMesh/Make/files | 1 - .../SLGThermo/SLGThermo/SLGThermo.C | 8 +- .../SLGThermo/SLGThermo/SLGThermo.H | 8 +- ...kinematicCloudPositions => cloudPositions} | 2 +- ...nematicCloudProperties => cloudProperties} | 6 +- .../constant/surfaceFilmProperties | 22 - .../constant/reactingCloud1Properties | 23 - .../constant/surfaceFilmProperties | 22 - .../cylinder/0/H2O | 0 .../cylinder/0/N2 | 0 .../cylinder/0/O2 | 0 .../cylinder/0/T | 0 .../cylinder/0/U | 0 .../cylinder/0/p | 0 .../cylinder/0/p_rgh | 0 .../cylinder/0/wallFilmRegion/T | 0 .../cylinder/0/wallFilmRegion/U | 0 .../cylinder/0/wallFilmRegion/delta | 0 .../cylinder/Allclean | 0 .../cylinder/Allmesh | 0 .../cylinder/Allrun | 0 .../cylinder/constant/cloudProperties} | 23 +- .../cylinder/constant/combustionProperties | 0 .../cylinder}/constant/g | 0 .../cylinder/constant/momentumTransport | 0 .../constant/parcelInjectionProperties | 6 +- .../cylinder}/constant/radiationProperties | 0 .../cylinder/constant/speciesThermo | 0 .../cylinder/constant/surfaceFilmProperties | 0 .../constant/thermophysicalProperties | 0 .../cylinder/system/blockMeshDict | 0 .../cylinder/system/controlDict | 2 +- .../cylinder/system/createPatchDict | 0 .../cylinder/system/decomposeParDict | 0 .../cylinder/system/extrudeToRegionMeshDict | 0 .../cylinder/system/fvSchemes | 0 .../cylinder/system/fvSolution | 0 .../cylinder/system/topoSetDict | 0 .../cylinder/system/wallFilmRegion/fvSchemes | 0 .../cylinder/system/wallFilmRegion/fvSolution | 0 .../hotBoxes/0/H2O | 0 .../hotBoxes/0/N2 | 0 .../hotBoxes/0/O2 | 0 .../hotBoxes/0/T | 0 .../hotBoxes/0/U | 0 .../hotBoxes/0/alphat | 0 .../hotBoxes/0/epsilon | 0 .../hotBoxes/0/htcConv | 0 .../hotBoxes/0/k | 0 .../hotBoxes/0/nut | 0 .../hotBoxes/0/p | 0 .../hotBoxes/0/p_rgh | 0 .../hotBoxes/0/wallFilmRegion/T | 0 .../hotBoxes/0/wallFilmRegion/U | 0 .../hotBoxes/0/wallFilmRegion/delta | 0 .../hotBoxes/Allclean | 0 .../hotBoxes/Allmesh | 0 .../hotBoxes/Allrun | 0 .../hotBoxes/Allrun-parallel | 0 .../hotBoxes/constant/cloudProperties} | 19 +- .../hotBoxes/constant/combustionProperties | 0 .../hotBoxes}/constant/g | 0 .../hotBoxes/constant/momentumTransport | 0 .../hotBoxes}/constant/radiationProperties | 0 .../hotBoxes}/constant/speciesThermo | 0 .../hotBoxes/constant/surfaceFilmProperties | 0 .../constant/thermophysicalProperties | 0 .../hotBoxes/createObstacle.setSet | 0 .../hotBoxes/createWallFilmZone.setSet | 0 .../hotBoxes/patchify.setSet | 0 .../hotBoxes/patchifyObstacles | 0 .../hotBoxes/system/blockMeshDict | 0 .../hotBoxes/system/controlDict | 2 +- .../hotBoxes/system/decomposeParDict | 0 .../hotBoxes/system/extrudeToRegionMeshDict | 0 .../hotBoxes/system/fvSchemes | 0 .../hotBoxes/system/fvSolution | 0 .../hotBoxes/system/topoSetDict | 0 .../system/wallFilmRegion/decomposeParDict | 0 .../hotBoxes/system/wallFilmRegion/fvSchemes | 0 .../hotBoxes/system/wallFilmRegion/fvSolution | 0 .../rivuletPanel/0/H2O | 0 .../rivuletPanel/0/N2 | 0 .../rivuletPanel/0/O2 | 0 .../rivuletPanel/0/T | 0 .../rivuletPanel/0/U | 0 .../rivuletPanel/0/p | 0 .../rivuletPanel/0/p_rgh | 0 .../rivuletPanel/0/wallFilmRegion/T | 0 .../rivuletPanel/0/wallFilmRegion/U | 0 .../rivuletPanel/0/wallFilmRegion/delta | 0 .../rivuletPanel/Allclean | 0 .../rivuletPanel/Allmesh | 0 .../rivuletPanel/Allrun | 0 .../constant/combustionProperties | 0 .../rivuletPanel}/constant/g | 0 .../rivuletPanel/constant/momentumTransport | 0 .../constant/parcelInjectionProperties | 0 .../constant/radiationProperties | 0 .../rivuletPanel}/constant/speciesThermo | 0 .../constant/surfaceFilmProperties | 0 .../constant/thermophysicalProperties | 0 .../createWallFilmRegionPatches.setSet | 0 .../rivuletPanel/system/blockMeshDict | 0 .../rivuletPanel/system/controlDict | 2 +- .../rivuletPanel/system/createPatchDict | 0 .../rivuletPanel/system/decomposeParDict | 0 .../system/extrudeToRegionMeshDict | 0 .../rivuletPanel/system/fvSchemes | 0 .../rivuletPanel/system/fvSolution | 0 .../system/wallFilmRegion.topoSet | 0 .../system/wallFilmRegion/createPatchDict | 0 .../system/wallFilmRegion/fvSchemes | 0 .../system/wallFilmRegion/fvSolution | 0 .../rivuletPanel/wallFilmRegion.setSet | 0 .../splashPanel/0/H2O | 0 .../splashPanel/0/N2 | 0 .../splashPanel/0/O2 | 0 .../splashPanel/0/T | 0 .../splashPanel/0/U | 0 .../splashPanel/0/p | 0 .../splashPanel/0/p_rgh | 0 .../splashPanel/0/wallFilm/T | 0 .../splashPanel/0/wallFilm/U | 0 .../splashPanel/0/wallFilm/delta | 0 .../splashPanel/Allclean | 0 .../splashPanel/Allrun | 0 .../splashPanel/constant/cloudProperties} | 23 +- .../constant/combustionProperties | 0 .../splashPanel}/constant/g | 0 .../splashPanel/constant/momentumTransport | 0 .../constant/parcelInjectionProperties} | 11 +- .../splashPanel}/constant/radiationProperties | 0 .../splashPanel}/constant/speciesThermo | 0 .../constant/surfaceFilmProperties | 0 .../constant/thermophysicalProperties | 0 .../splashPanel/system/blockMeshDict | 0 .../splashPanel/system/controlDict | 2 +- .../splashPanel/system/createPatchDict | 0 .../splashPanel/system/decomposeParDict | 0 .../system/extrudeToRegionMeshDict | 0 .../splashPanel/system/fvSchemes | 0 .../splashPanel/system/fvSolution | 0 .../splashPanel/system/topoSetDict | 0 .../splashPanel/system/wallFilm/fvSchemes | 0 .../splashPanel/system/wallFilm/fvSolution | 0 .../Goldschmidt/0/U.air | 0 .../Goldschmidt/0/p | 0 .../Goldschmidt/constant/cloudPositions} | 2 +- .../Goldschmidt/constant/cloudProperties} | 19 +- .../Goldschmidt}/constant/g | 0 .../constant/momentumTransport.air | 0 .../Goldschmidt/constant/transportProperties | 0 .../Goldschmidt/system/blockMeshDict | 0 .../Goldschmidt/system/controlDict | 4 +- .../Goldschmidt/system/decomposeParDict | 0 .../Goldschmidt/system/fvSchemes | 0 .../Goldschmidt/system/fvSolution | 9 +- .../Goldschmidt/system/mapFieldsDict | 0 .../GoldschmidtMPPIC}/0/U.air | 0 .../GoldschmidtMPPIC}/0/p | 3 - .../GoldschmidtMPPIC/constant/cloudPositions} | 2 +- .../constant/cloudProperties} | 7 +- .../GoldschmidtMPPIC}/constant/g | 0 .../constant/momentumTransport.air | 0 .../constant/transportProperties | 0 .../GoldschmidtMPPIC}/system/blockMeshDict | 0 .../GoldschmidtMPPIC}/system/controlDict | 4 +- .../GoldschmidtMPPIC}/system/decomposeParDict | 4 +- .../GoldschmidtMPPIC}/system/fvSchemes | 2 +- .../GoldschmidtMPPIC}/system/fvSolution | 7 +- .../column/0/U.air | 0 .../column/0/p | 0 .../column/constant/cloudPositions} | 2 +- .../column/constant/cloudProperties} | 7 +- .../column}/constant/g | 0 .../column/constant/momentumTransport.air | 0 .../column/constant/transportProperties | 0 .../column/system/blockMeshDict | 0 .../column/system/controlDict | 2 +- .../column/system/fvSchemes | 2 +- .../column/system/fvSolution | 7 +- .../cyclone/0/U.air | 0 .../cyclone/0/k.air | 0 .../cyclone/0/nut.air | 0 .../cyclone/0/p | 0 .../cyclone/Allrun | 2 +- .../cyclone/constant/cloudProperties} | 5 +- .../cyclone/constant/g | 0 .../cyclone/constant/momentumTransport.air | 0 .../cyclone/constant/transportProperties | 0 .../constant/triSurface/cyclone.stl.gz | Bin .../cyclone/system/blockMeshDict | 0 .../cyclone/system/controlDict | 2 +- .../cyclone/system/decomposeParDict | 0 .../cyclone/system/fvSchemes | 2 +- .../cyclone/system/fvSolution | 7 +- .../cyclone/system/snappyHexMeshDict | 0 .../injectionChannel/0/U.air | 0 .../injectionChannel/0/p | 0 .../constant/cloudProperties} | 6 +- .../injectionChannel/constant/g | 0 .../constant/momentumTransport.air | 0 .../constant/transportProperties | 0 .../injectionChannel/system/blockMeshDict | 0 .../injectionChannel/system/controlDict | 2 +- .../injectionChannel/system/fvSchemes | 0 .../injectionChannel/system/fvSolution | 5 + ...nematicCloudProperties => cloudProperties} | 4 +- ...kinematicCloudPositions => cloudPositions} | 2 +- ...nematicCloudProperties => cloudProperties} | 6 +- ...kinematicCloudPositions => cloudPositions} | 2 +- ...nematicCloudProperties => cloudProperties} | 6 +- .../counterFlowFlame2DLTS/0/p | 49 --- .../reactingParcelFoam/filter/0.orig/p | 68 --- .../filter/constant/parcelInjectionProperties | 26 -- .../reactingParcelFoam/parcelInBox/0/p | 54 --- .../constant/reactingCloud1Properties | 24 -- .../reactingParcelFoam/verticalChannel/0/p | 55 --- .../reactingParcelFoam/verticalChannelLTS/0/p | 55 --- .../aachenBomb/0/N2 | 0 .../aachenBomb/0/O2 | 0 .../aachenBomb/0/T | 0 .../aachenBomb/0/U | 0 .../aachenBomb/0/Ydefault | 0 .../aachenBomb/0/alphat | 0 .../aachenBomb/0/epsilon | 0 .../aachenBomb/0/k | 0 .../aachenBomb/0/nut | 0 .../aachenBomb/0/p | 0 .../aachenBomb/Allclean | 0 .../aachenBomb/Allrun | 0 .../aachenBomb/chemkin/chem.inp | 0 .../aachenBomb/chemkin/therm.dat | 0 .../aachenBomb/chemkin/transportProperties | 0 .../aachenBomb/constant/chemistryProperties | 0 .../aachenBomb/constant/cloudProperties} | 4 +- .../aachenBomb/constant/combustionProperties | 0 .../aachenBomb/constant/g | 0 .../aachenBomb/constant/momentumTransport | 0 .../aachenBomb}/constant/radiationProperties | 0 .../constant/thermophysicalProperties | 2 +- .../aachenBomb/system/blockMeshDict | 0 .../aachenBomb/system/controlDict | 2 +- .../aachenBomb/system/fvSchemes | 0 .../aachenBomb/system/fvSolution | 0 .../counterFlowFlame2DLTS/0/CH4 | 0 .../counterFlowFlame2DLTS/0/CO2 | 0 .../counterFlowFlame2DLTS/0/H2O | 0 .../counterFlowFlame2DLTS/0/N2 | 0 .../counterFlowFlame2DLTS/0/O2 | 0 .../counterFlowFlame2DLTS/0/T | 0 .../counterFlowFlame2DLTS/0/U | 0 .../counterFlowFlame2DLTS/0/nut | 0 .../counterFlowFlame2DLTS/0/p} | 4 +- .../counterFlowFlame2DLTS/0/rho | 0 .../constant/chemistryProperties | 0 .../constant/combustionProperties | 0 .../counterFlowFlame2DLTS/constant/g | 0 .../constant/momentumTransport | 0 .../constant/radiationProperties | 0 .../counterFlowFlame2DLTS/constant/reactions | 0 .../constant/thermo.compressibleGas | 0 .../constant/thermophysicalProperties | 0 .../system/blockMeshDict | 0 .../counterFlowFlame2DLTS/system/controlDict | 2 +- .../counterFlowFlame2DLTS/system/fvSchemes | 0 .../counterFlowFlame2DLTS/system/fvSolution | 6 +- .../filter/0.orig/G | 0 .../filter/0.orig/H2O | 0 .../filter/0.orig/N2 | 0 .../filter/0.orig/O2 | 0 .../filter/0.orig/T | 0 .../filter/0.orig/U | 0 .../filter/0.orig/alphat | 0 .../filter/0.orig/epsilon | 0 .../filter/0.orig/k | 0 .../filter/0.orig/nut | 0 .../filter/0.orig/p} | 6 +- .../filter/Allclean | 0 .../filter/Allrun | 0 .../filter/constant/cloudProperties} | 23 +- .../filter}/constant/combustionProperties | 0 .../filter/constant/fvOptions | 0 .../filter/constant/g | 0 .../filter/constant/momentumTransport | 0 .../constant/parcelInjectionProperties | 9 +- .../filter/constant/particleTrackProperties | 0 .../filter}/constant/radiationProperties | 0 .../filter}/constant/speciesThermo | 0 .../filter}/constant/thermophysicalProperties | 0 .../filter/system/blockMeshDict | 0 .../filter/system/controlDict | 2 +- .../filter/system/createBafflesDict | 0 .../filter/system/decomposeParDict | 0 .../filter/system/fvSchemes | 0 .../filter/system/fvSolution | 6 +- .../filter/system/topoSetDict | 0 .../parcelInBox/0/G | 0 .../parcelInBox/0/H2O | 0 .../parcelInBox/0/T | 0 .../parcelInBox/0/U | 0 .../parcelInBox/0/air | 0 .../parcelInBox/0/p} | 6 +- .../parcelInBox/README | 0 .../parcelInBox/constant/cloudPositions} | 0 .../parcelInBox/constant/cloudProperties} | 23 +- .../constant/combustionProperties | 0 .../parcelInBox/constant/g | 0 .../parcelInBox/constant/momentumTransport | 0 .../parcelInBox}/constant/radiationProperties | 0 .../parcelInBox/constant/speciesThermo | 0 .../constant/thermophysicalProperties | 0 .../parcelInBox/system/blockMeshDict | 0 .../parcelInBox/system/controlDict | 2 +- .../parcelInBox/system/fvSchemes | 0 .../parcelInBox/system/fvSolution | 6 +- .../parcelInBox/system/probesDict | 0 .../simplifiedSiwek/0/CH4 | 0 .../simplifiedSiwek/0/CO | 0 .../simplifiedSiwek/0/CO2 | 0 .../simplifiedSiwek/0/G | 0 .../simplifiedSiwek/0/H2 | 0 .../simplifiedSiwek/0/H2O | 0 .../simplifiedSiwek/0/N2 | 0 .../simplifiedSiwek/0/O2 | 0 .../simplifiedSiwek/0/T | 0 .../simplifiedSiwek/0/U | 0 .../simplifiedSiwek/0/alphat | 0 .../simplifiedSiwek/0/epsilon | 0 .../simplifiedSiwek/0/k | 0 .../simplifiedSiwek/0/nut | 0 .../simplifiedSiwek/0/p.orig | 0 .../simplifiedSiwek/Allrun | 0 .../constant/chemistryProperties | 0 .../simplifiedSiwek/constant/clouds} | 13 +- .../constant/coalCloudPositions} | 0 .../constant/coalCloudProperties} | 6 +- .../constant/combustionProperties | 0 .../simplifiedSiwek/constant/fvOptions | 0 .../simplifiedSiwek}/constant/g | 0 .../constant/limestoneCloudPositions} | 0 .../constant/limestoneCloudProperties} | 6 +- .../constant/momentumTransport | 0 .../constant/radiationProperties | 8 +- .../simplifiedSiwek/constant/reactions | 0 .../simplifiedSiwek/constant/speciesThermo | 0 .../constant/thermophysicalProperties | 2 +- .../simplifiedSiwek/system/blockMeshDict | 0 .../simplifiedSiwek/system/controlDict | 2 +- .../simplifiedSiwek/system/decomposeParDict | 0 .../simplifiedSiwek/system/fvSchemes | 0 .../simplifiedSiwek/system/fvSolution | 0 .../simplifiedSiwek/system/topoSetDict | 0 .../verticalChannel/0/H2O | 0 .../verticalChannel/0/T | 0 .../verticalChannel/0/U.orig | 0 .../verticalChannel/0/air | 0 .../verticalChannel/0/alphat | 0 .../verticalChannel/0/k | 0 .../verticalChannel/0/nut | 0 .../verticalChannel/0/omega | 0 .../verticalChannel/0/p} | 6 +- .../verticalChannel/Allrun | 0 .../verticalChannel/constant/cloudProperties} | 21 +- .../constant/combustionProperties | 0 .../verticalChannel/constant/g | 0 .../constant/momentumTransport | 0 .../constant/particleTrackProperties | 0 .../constant/radiationProperties | 0 .../verticalChannel/constant/speciesThermo | 0 .../constant/thermophysicalProperties | 0 .../verticalChannel/system/blockMeshDict | 0 .../verticalChannel/system/controlDict | 2 +- .../verticalChannel/system/fvSchemes | 0 .../verticalChannel/system/fvSolution | 8 +- .../verticalChannelLTS/0/H2O | 0 .../verticalChannelLTS/0/T | 0 .../verticalChannelLTS/0/U.orig | 0 .../verticalChannelLTS/0/air | 0 .../verticalChannelLTS/0/alphat | 0 .../verticalChannelLTS/0/k | 0 .../verticalChannelLTS/0/nut | 0 .../verticalChannelLTS/0/omega | 0 .../verticalChannelLTS/0/p} | 6 +- .../verticalChannelLTS/Allrun | 0 .../constant/cloudProperties} | 21 +- .../constant/combustionProperties | 0 .../verticalChannelLTS/constant/g | 0 .../constant/momentumTransport | 0 .../constant/particleTrackDict | 0 .../constant/radiationProperties | 0 .../verticalChannelLTS/constant/speciesThermo | 0 .../constant/thermophysicalProperties | 0 .../verticalChannelLTS/system/blockMeshDict | 0 .../verticalChannelLTS/system/controlDict | 2 +- .../verticalChannelLTS/system/fvSchemes | 0 .../verticalChannelLTS/system/fvSolution | 8 +- .../verticalChannel/0/H2O | 0 .../verticalChannel/0/T | 0 .../verticalChannel/0/U.orig | 0 .../verticalChannel/0/air | 0 .../verticalChannel/0/alphat | 0 .../verticalChannel/0/k | 0 .../verticalChannel/0/nut | 0 .../verticalChannel/0/omega | 0 .../verticalChannel/0/p | 0 .../verticalChannel/Allrun | 0 .../verticalChannel/constant/cloudProperties} | 4 +- .../constant/combustionProperties | 0 .../verticalChannel/constant/g | 0 .../constant/momentumTransport | 0 .../constant/particleTrackDict | 0 .../constant/radiationProperties | 0 .../verticalChannel/constant/speciesThermo | 0 .../constant/thermophysicalProperties | 0 .../verticalChannel/system/blockMeshDict | 0 .../verticalChannel/system/controlDict | 2 +- .../verticalChannel/system/fvSchemes | 0 .../verticalChannel/system/fvSolution | 0 1086 files changed, 5128 insertions(+), 5360 deletions(-) delete mode 100644 applications/solvers/lagrangian/DPMFoam/DPMFoam.C delete mode 100644 applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files delete mode 100644 applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C delete mode 100644 applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/files delete mode 100644 applications/solvers/lagrangian/DPMFoam/Make/files delete mode 100644 applications/solvers/lagrangian/DPMFoam/Make/options delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/EEqn.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/Make/files delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/Make/options delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/YEqn.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/createClouds.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/createFields.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/pEqn.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H delete mode 100644 applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/Allwclean (76%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/Allwmake (78%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/CourantNo.H (96%) create mode 100644 applications/solvers/lagrangian/denseParticleFoam/Make/files rename applications/solvers/lagrangian/{DPMFoam/MPPICFoam => denseParticleFoam}/Make/options (83%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/UcEqn.H (51%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/continuityErrs.H (96%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/correctPhic.H (100%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/createFields.H (87%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/createUcf.H (96%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/createUcfIfPresent.H (96%) create mode 100644 applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C create mode 100644 applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files rename applications/solvers/lagrangian/{DPMFoam/DPMMomentumTransportModels => denseParticleFoam/denseParticleMomentumTransportModels}/Make/options (100%) rename applications/solvers/lagrangian/{DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C => denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C} (100%) rename applications/solvers/lagrangian/{DPMFoam => denseParticleFoam}/pEqn.H (50%) delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/Make/files delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/createClouds.H delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/files delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createClouds.H rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/EEqn.H (97%) create mode 100644 applications/solvers/lagrangian/reactingParticleFoam/Make/files rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/Make/options (87%) rename applications/solvers/lagrangian/{coalChemistryFoam => reactingParticleFoam}/UEqn.H (88%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/YEqn.H (96%) create mode 100644 applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files rename applications/solvers/lagrangian/{sprayFoam/engineFoam => reactingParticleFoam/buoyantReactingParticleFoam}/Make/options (78%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam/buoyantReactingParticleFoam}/UEqn.H (96%) rename applications/solvers/lagrangian/{coalChemistryFoam/coalChemistryFoam.C => reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C} (58%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam/buoyantReactingParticleFoam}/createFields.H (96%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam/buoyantReactingParticleFoam}/pEqn.H (90%) create mode 100644 applications/solvers/lagrangian/reactingParticleFoam/createClouds.H rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/createFieldRefs.H (100%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam}/createFields.H (72%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/createSurfaceFilmModel.H (100%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam}/engineFoam/Make/files (100%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam/engineFoam}/Make/options (76%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam}/engineFoam/engineFoam.C (59%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam}/engineFoam/logSummary.H (100%) rename applications/solvers/lagrangian/{sprayFoam => reactingParticleFoam}/engineFoam/startSummary.H (100%) create mode 100644 applications/solvers/lagrangian/reactingParticleFoam/pEqn.H rename applications/solvers/lagrangian/{sprayFoam/sprayFoam.C => reactingParticleFoam/reactingParticleFoam.C} (75%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/rhoEqn.H (94%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/setMultiRegionDeltaT.H (96%) rename applications/solvers/lagrangian/{reactingParcelFoam => reactingParticleFoam}/setRDeltaT.H (98%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/EEqn.H (96%) create mode 100644 applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/Make/options (86%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/UEqn.H (94%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/YEqn.H (96%) create mode 100644 applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H rename applications/solvers/lagrangian/{sprayFoam => simpleReactingParticleFoam}/createFieldRefs.H (100%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/createFields.H (100%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam => simpleReactingParticleFoam}/pEqn.H (98%) rename applications/solvers/lagrangian/{reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C => simpleReactingParticleFoam/simpleReactingParticleFoam.C} (96%) delete mode 100644 applications/solvers/lagrangian/sprayFoam/EEqn.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/Make/files delete mode 100644 applications/solvers/lagrangian/sprayFoam/UEqn.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/YEqn.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/createClouds.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/pEqn.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/rhoEqn.H create mode 100755 bin/DPMFoam create mode 100755 bin/MPPICFoam create mode 100755 bin/coalChemistryFoam create mode 100755 bin/reactingParcelFoam create mode 100755 bin/simpleReactingParcelFoam create mode 100755 bin/sprayFoam rename etc/caseDicts/solvers/lagrangian/{kinematicCloudProperties => cloudProperties} (98%) create mode 100644 src/engine/include/createEngineControls.H create mode 100644 src/engine/include/createEngineTimeControls.H create mode 100644 src/engine/include/readEngineControls.H rename src/lagrangian/{coalCombustion/coalParcel/makeCoalParcelSubmodels.C => DSMC/clouds/Templates/DSMCCloud/DSMCCloudName.C} (82%) delete mode 100644 src/lagrangian/coalCombustion/Make/files delete mode 100644 src/lagrangian/coalCombustion/Make/options delete mode 100644 src/lagrangian/coalCombustion/coalCloudList/coalCloudList.C delete mode 100644 src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H delete mode 100644 src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H delete mode 100644 src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H delete mode 100644 src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H delete mode 100644 src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H delete mode 100644 src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H delete mode 100644 src/lagrangian/intermediate/clouds/derived/basicKinematicCollidingCloud/basicKinematicCollidingCloud.H delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/defineBasicKinematicCollidingParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/defineBasicKinematicMPPICParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C delete mode 100644 src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H rename src/lagrangian/{intermediate => parcel}/Make/files (52%) rename src/lagrangian/{intermediate => parcel}/Make/options (100%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/CollidingCloud/CollidingCloud.C (93%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/CollidingCloud/CollidingCloud.H (87%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/CollidingCloud/CollidingCloudI.H (97%) create mode 100644 src/lagrangian/parcel/clouds/Templates/CollidingCloud/CollidingCloudName.C rename src/lagrangian/{intermediate => parcel}/clouds/Templates/MPPICCloud/MPPICCloud.C (95%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/MPPICCloud/MPPICCloud.H (87%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/MPPICCloud/MPPICCloudI.H (97%) create mode 100644 src/lagrangian/parcel/clouds/Templates/MPPICCloud/MPPICCloudName.C rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C => parcel/clouds/Templates/MomentumCloud/MomentumCloud.C} (82%) rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H => parcel/clouds/Templates/MomentumCloud/MomentumCloud.H} (81%) rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H => parcel/clouds/Templates/MomentumCloud/MomentumCloudI.H} (63%) create mode 100644 src/lagrangian/parcel/clouds/Templates/MomentumCloud/MomentumCloudName.C rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud => parcel/clouds/Templates/MomentumCloud}/cloudSolution/cloudSolution.C (99%) rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud => parcel/clouds/Templates/MomentumCloud}/cloudSolution/cloudSolution.H (99%) rename src/lagrangian/{intermediate/clouds/Templates/KinematicCloud => parcel/clouds/Templates/MomentumCloud}/cloudSolution/cloudSolutionI.H (97%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingCloud/ReactingCloud.C (96%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingCloud/ReactingCloud.H (94%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingCloud/ReactingCloudI.H (98%) create mode 100644 src/lagrangian/parcel/clouds/Templates/ReactingCloud/ReactingCloudName.C rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C (97%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H (93%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H (97%) create mode 100644 src/lagrangian/parcel/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudName.C rename src/lagrangian/{spray => parcel}/clouds/Templates/SprayCloud/SprayCloud.C (98%) rename src/lagrangian/{spray => parcel}/clouds/Templates/SprayCloud/SprayCloud.H (93%) rename src/lagrangian/{spray => parcel}/clouds/Templates/SprayCloud/SprayCloudI.H (98%) create mode 100644 src/lagrangian/parcel/clouds/Templates/SprayCloud/SprayCloudName.C rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ThermoCloud/ThermoCloud.C (96%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ThermoCloud/ThermoCloud.H (90%) rename src/lagrangian/{intermediate => parcel}/clouds/Templates/ThermoCloud/ThermoCloudI.H (96%) create mode 100644 src/lagrangian/parcel/clouds/Templates/ThermoCloud/ThermoCloudName.C rename src/{mesh/snappyHexMesh/trackedParticle/trackedParticleCloud.C => lagrangian/parcel/clouds/derived/collidingCloud/collidingCloud.C} (75%) rename src/lagrangian/{intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H => parcel/clouds/derived/collidingCloud/collidingCloud.H} (75%) rename src/{functionObjects/field/nearWallFields/findCellParticleCloud.C => lagrangian/parcel/clouds/derived/momentumCloud/momentumCloud.C} (77%) rename src/lagrangian/{intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H => parcel/clouds/derived/momentumCloud/momentumCloud.H} (75%) create mode 100644 src/lagrangian/parcel/clouds/derived/mppicCloud/mppicCloud.C rename src/lagrangian/{intermediate/clouds/derived/basicKinematicMPPICCloud/basicKinematicMPPICCloud.H => parcel/clouds/derived/mppicCloud/mppicCloud.H} (76%) rename src/lagrangian/{intermediate/clouds/baseClasses => parcel/clouds/derived}/reactingCloud/reactingCloud.C (78%) rename src/lagrangian/{coalCombustion/coalCloud/coalCloud.H => parcel/clouds/derived/reactingCloud/reactingCloud.H} (78%) rename src/lagrangian/{intermediate/clouds/baseClasses => parcel/clouds/derived}/reactingMultiphaseCloud/reactingMultiphaseCloud.C (76%) rename src/lagrangian/{intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H => parcel/clouds/derived/reactingMultiphaseCloud/reactingMultiphaseCloud.H} (73%) rename src/lagrangian/{spray/clouds/baseClasses => parcel/clouds/derived}/sprayCloud/sprayCloud.C (78%) rename src/lagrangian/{spray/clouds/derived/basicSprayCloud/basicSprayCloud.H => parcel/clouds/derived/sprayCloud/sprayCloud.H} (76%) rename src/lagrangian/{intermediate/clouds/baseClasses => parcel/clouds/derived}/thermoCloud/thermoCloud.C (78%) rename src/lagrangian/{intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H => parcel/clouds/derived/thermoCloud/thermoCloud.H} (78%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/Euler/Euler.C (97%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/Euler/Euler.H (97%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/analytical/analytical.C (97%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/analytical/analytical.H (97%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/integrationScheme/integrationScheme.C (96%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/integrationScheme/integrationScheme.H (98%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/integrationScheme/integrationSchemeNew.C (97%) rename src/lagrangian/{intermediate => parcel}/integrationScheme/integrationScheme/integrationSchemeTemplates.C (97%) rename src/lagrangian/{DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H => parcel/parcelCloud/ParcelCloud.H} (61%) create mode 100644 src/lagrangian/parcel/parcelCloud/ParcelCloudBase.H rename src/lagrangian/{DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C => parcel/parcelCloud/parcelCloud.C} (78%) create mode 100644 src/lagrangian/parcel/parcelCloud/parcelCloud.H rename src/lagrangian/{intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C => parcel/parcelCloud/parcelCloudBase.C} (86%) create mode 100644 src/lagrangian/parcel/parcelCloud/parcelCloudBase.H create mode 100644 src/lagrangian/parcel/parcelCloud/parcelCloudNew.C create mode 100644 src/lagrangian/parcel/parcelCloudList/parcelCloudList.C create mode 100644 src/lagrangian/parcel/parcelCloudList/parcelCloudList.H rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollidingParcel.C (100%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollidingParcel.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollidingParcelI.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollidingParcelIO.C (99%) create mode 100644 src/lagrangian/parcel/parcels/Templates/CollidingParcel/CollidingParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollidingParcelTrackingDataI.H (100%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.C (99%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordList.H (99%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/CollisionRecordListI.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordI.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecordIO.C (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordI.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecordIO.C (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/MPPICParcel/MPPICParcel.C (100%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/MPPICParcel/MPPICParcel.H (95%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/MPPICParcel/MPPICParcelI.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/MPPICParcel/MPPICParcelIO.C (98%) create mode 100644 src/lagrangian/parcel/parcels/Templates/MPPICParcel/MPPICParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/MPPICParcel/MPPICParcelTrackingDataI.H (100%) rename src/lagrangian/{intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C => parcel/parcels/Templates/MomentumParcel/MomentumParcel.C} (91%) rename src/lagrangian/{intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H => parcel/parcels/Templates/MomentumParcel/MomentumParcel.H} (92%) rename src/lagrangian/{intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H => parcel/parcels/Templates/MomentumParcel/MomentumParcelI.H} (67%) rename src/lagrangian/{intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C => parcel/parcels/Templates/MomentumParcel/MomentumParcelIO.C} (88%) create mode 100644 src/lagrangian/parcel/parcels/Templates/MomentumParcel/MomentumParcelName.C rename src/lagrangian/{intermediate/parcels/Templates/KinematicParcel/KinematicParcelTrackingDataI.H => parcel/parcels/Templates/MomentumParcel/MomentumParcelTrackingDataI.H} (78%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C (95%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C (99%) create mode 100644 src/lagrangian/parcel/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingParcel/ReactingParcel.C (95%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingParcel/ReactingParcel.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingParcel/ReactingParcelI.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingParcel/ReactingParcelIO.C (99%) create mode 100644 src/lagrangian/parcel/parcels/Templates/ReactingParcel/ReactingParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ReactingParcel/ReactingParcelTrackingDataI.H (100%) rename src/lagrangian/{spray => parcel}/parcels/Templates/SprayParcel/SprayParcel.C (99%) rename src/lagrangian/{spray => parcel}/parcels/Templates/SprayParcel/SprayParcel.H (97%) rename src/lagrangian/{spray => parcel}/parcels/Templates/SprayParcel/SprayParcelI.H (99%) rename src/lagrangian/{spray => parcel}/parcels/Templates/SprayParcel/SprayParcelIO.C (99%) create mode 100644 src/lagrangian/parcel/parcels/Templates/SprayParcel/SprayParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ThermoParcel/ThermoParcel.C (95%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ThermoParcel/ThermoParcel.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ThermoParcel/ThermoParcelI.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ThermoParcel/ThermoParcelIO.C (98%) create mode 100644 src/lagrangian/parcel/parcels/Templates/ThermoParcel/ThermoParcelName.C rename src/lagrangian/{intermediate => parcel}/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H (100%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H => parcel/parcels/derived/collidingParcel/collidingParcel.H} (77%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C => parcel/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C} (72%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C => parcel/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C} (76%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H => parcel/parcels/derived/momentumParcel/momentumParcel.H} (80%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C => parcel/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C} (71%) rename src/lagrangian/{intermediate/parcels/derived/basicKinematicMPPICParcel/basicKinematicMPPICParcel.H => parcel/parcels/derived/mppicParcel/mppicParcel.H} (78%) rename src/lagrangian/{intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C => parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C} (74%) rename src/lagrangian/{coalCombustion/coalParcel/coalParcel.H => parcel/parcels/derived/reactingMultiphaseParcel/reactingMultiphaseParcel.H} (81%) rename src/lagrangian/{intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C => parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C} (73%) rename src/lagrangian/{intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H => parcel/parcels/derived/reactingParcel/reactingParcel.H} (79%) rename src/lagrangian/{spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C => parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C} (65%) rename src/lagrangian/{spray/parcels/derived/basicSprayParcel/basicSprayParcel.H => parcel/parcels/derived/sprayParcel/sprayParcel.H} (84%) rename src/lagrangian/{intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C => parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C} (76%) rename src/lagrangian/{intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H => parcel/parcels/derived/thermoParcel/thermoParcel.H} (81%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeMPPICParcelDampingModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeMPPICParcelIsotropyModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeMPPICParcelPackingModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelCloudFunctionObjects.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelCollisionModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelDispersionModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelForces.H (98%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelHeatTransferModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelInjectionModels.H (93%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelPatchInteractionModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelStochasticCollisionModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeParcelSurfaceFilmModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingMultiphaseParcelCompositionModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingMultiphaseParcelInjectionModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingMultiphaseParcelStochasticCollisionModels.H (96%) rename src/lagrangian/{coalCombustion/include/makeCoalParcelSurfaceReactionModels.H => parcel/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H} (82%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingParcelCompositionModels.H (96%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingParcelInjectionModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingParcelPhaseChangeModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeReactingParcelSurfaceFilmModels.H (96%) rename src/lagrangian/{spray => parcel}/parcels/include/makeSprayParcelAtomizationModels.H (97%) rename src/lagrangian/{spray => parcel}/parcels/include/makeSprayParcelBreakupModels.H (97%) rename src/lagrangian/{spray => parcel}/parcels/include/makeSprayParcelInjectionModels.H (97%) rename src/lagrangian/{spray => parcel}/parcels/include/makeSprayParcelStochasticCollisionModels.H (97%) rename src/lagrangian/{intermediate => parcel}/parcels/include/makeThermoParcelSurfaceFilmModels.H (97%) rename src/lagrangian/{intermediate => parcel}/phaseProperties/phaseProperties/phaseProperties.C (99%) rename src/lagrangian/{intermediate => parcel}/phaseProperties/phaseProperties/phaseProperties.H (98%) rename src/lagrangian/{intermediate => parcel}/phaseProperties/phaseProperties/phasePropertiesIO.C (98%) rename src/lagrangian/{intermediate => parcel}/phaseProperties/phasePropertiesList/phasePropertiesList.C (97%) rename src/lagrangian/{intermediate => parcel}/phaseProperties/phasePropertiesList/phasePropertiesList.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H (90%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectListI.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessingI.H (95%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollectorI.H (95%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H (95%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/RelativeVelocity/RelativeVelocity.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/RelativeVelocity/RelativeVelocity.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudSubModelBase.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/CloudSubModelBase.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ForceTypes/ParticleForceList/ParticleForceList.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ForceTypes/ParticleForceList/ParticleForceList.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ForceTypes/ParticleForceList/ParticleForceListI.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethodI.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Basic/Basic.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Basic/Basic.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Dual/Dual.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Dual/Dual.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Moment/Moment.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/Moment/Moment.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/DampingModel/DampingModel.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/NoDamping/NoDamping.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/NoDamping/NoDamping.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/Relaxation/Relaxation.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/DampingModels/Relaxation/Relaxation.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/NoIsotropy/NoIsotropy.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/Explicit/Explicit.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/Explicit/Explicit.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/Implicit/Implicit.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/Implicit/Implicit.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/NoPacking/NoPacking.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/NoPacking/NoPacking.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/PackingModel/PackingModel.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/Lun/Lun.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/Lun/Lun.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/exponential/exponential.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/ParticleStressModels/exponential/exponential.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/isotropic/isotropic.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/MPPIC/TimeScaleModels/nonEquilibrium/nonEquilibrium.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/CollisionModel/CollisionModel.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/CollisionModel/CollisionModel.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/CollisionModel/CollisionModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/NoCollision/NoCollision.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/NoCollision/NoCollision.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairCollision.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairCollision.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H (82%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairModel/PairModel/PairModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H (82%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallModel/WallModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallSiteData/WallSiteData.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallSiteData/WallSiteData.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/CollisionModel/PairCollision/WallSiteData/WallSiteDataI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/DispersionModel/DispersionModel.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/DispersionModel/DispersionModel.H (86%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/DispersionModel/DispersionModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/NoDispersion/NoDispersion.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/NoDispersion/NoDispersion.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/CellZoneInjection/CellZoneInjection.C (100%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/CellZoneInjection/CellZoneInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/ConeInjection/ConeInjection.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/ConeInjection/ConeInjection.H (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InflationInjection/InflationInjection.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InflationInjection/InflationInjection.H (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModel.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModel.H (94%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModelI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModelList.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModelList.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/InjectionModel/InjectionModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/ManualInjection/ManualInjection.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/ManualInjection/ManualInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.C} (84%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/MomentumLookupTableInjection.H} (87%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionData.C} (83%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionData.H} (77%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataI.H => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionDataI.H} (66%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionDataIO.C} (82%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionDataIOList.C} (93%) rename src/lagrangian/{intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H => parcel/submodels/Momentum/InjectionModel/MomentumLookupTableInjection/momentumParcelInjectionDataIOList.H} (82%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/NoInjection/NoInjection.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/NoInjection/NoInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchInjection/PatchInjection.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchInjection/PatchInjection.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchInjection/patchInjectionBase.C (100%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/InjectionModel/PatchInjection/patchInjectionBase.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/DenseDrag/DenseDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/DenseDrag/DenseDragForce.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/DistortedSphereDrag/DistortedSphereDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/SchillerNaumannDrag/SchillerNaumannDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/SchillerNaumannDrag/SchillerNaumannDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/SphereDrag/SphereDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/SphereDrag/SphereDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Drag/WenYuDrag/WenYuDragForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Gravity/GravityForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Gravity/GravityForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Gravity/GravityForceI.H (95%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/LiftForce/LiftForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/LiftForce/LiftForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/LiftForce/LiftForceI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/NonInertialFrame/NonInertialFrameForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/NonInertialFrame/NonInertialFrameForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/NonInertialFrame/NonInertialFrameForceI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Paramagnetic/ParamagneticForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Paramagnetic/ParamagneticForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Paramagnetic/ParamagneticForceI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/ParticleForce/ParticleForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/ParticleForce/ParticleForce.H (90%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/ParticleForce/ParticleForceI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/ParticleForce/ParticleForceNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/PressureGradient/PressureGradientForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/PressureGradient/PressureGradientForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/PressureGradient/PressureGradientForceI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/SRF/SRFForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/SRF/SRFForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Scaled/ScaledForce.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/Scaled/ScaledForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/VirtualMass/VirtualMassForce.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/VirtualMass/VirtualMassForce.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/forceSuSp/forceSuSp.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/ParticleForces/forceSuSp/forceSuSpI.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/LocalInteraction.C (99%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/LocalInteraction.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/patchInteractionData.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/patchInteractionData.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/NoInteraction/NoInteraction.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/NoInteraction/NoInteraction.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H (89%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/Rebound/Rebound.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/Rebound/Rebound.H (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/StochasticCollision/NoStochasticCollision/NoStochasticCollision.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/StochasticCollision/NoStochasticCollision/NoStochasticCollision.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H (87%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/StochasticCollision/StochasticCollisionModel/StochasticCollisionModelNew.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C (97%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H (98%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C (100%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H (91%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelI.H (96%) rename src/lagrangian/{intermediate/submodels/Kinematic => parcel/submodels/Momentum}/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/NoComposition/NoComposition.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.C (96%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataI.H (95%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataI.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C (94%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.H (98%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C (100%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H (98%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationHurtMitchell/COxidationHurtMitchell.C (100%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationHurtMitchell/COxidationHurtMitchell.H (98%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationIntrinsicRate/COxidationIntrinsicRate.C (100%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationIntrinsicRate/COxidationIntrinsicRate.H (98%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C (100%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H (98%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationMurphyShaddix/COxidationMurphyShaddix.C (100%) rename src/lagrangian/{coalCombustion/submodels/surfaceReactionModel => parcel/submodels/ReactingMultiphase/SurfaceReactionModel}/COxidationMurphyShaddix/COxidationMurphyShaddix.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/AtomizationModel/AtomizationModel.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/AtomizationModel/AtomizationModel.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/AtomizationModel/AtomizationModelNew.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/LISAAtomization/LISAAtomization.C (99%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/LISAAtomization/LISAAtomization.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/LISAAtomization/LISASMDCalcMethod1.H (100%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/LISAAtomization/LISASMDCalcMethod2.H (100%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/NoAtomization/NoAtomization.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/AtomizationModel/NoAtomization/NoAtomization.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/BreakupModel/BreakupModel.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/BreakupModel/BreakupModel.H (99%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/BreakupModel/BreakupModelNew.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ETAB/ETAB.C (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ETAB/ETAB.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/NoBreakup/NoBreakup.C (97%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/NoBreakup/NoBreakup.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/PilchErdman/PilchErdman.C (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/PilchErdman/PilchErdman.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ReitzDiwakar/ReitzDiwakar.C (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ReitzDiwakar/ReitzDiwakar.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ReitzKHRT/ReitzKHRT.C (99%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/ReitzKHRT/ReitzKHRT.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/SHF/SHF.C (100%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/SHF/SHF.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/TAB/TAB.C (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/TAB/TAB.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/TAB/TABSMDCalcMethod1.H (100%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/BreakupModel/TAB/TABSMDCalcMethod2.H (100%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/StochasticCollision/ORourkeCollision/ORourkeCollision.C (99%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/StochasticCollision/ORourkeCollision/ORourkeCollision.H (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C (98%) rename src/lagrangian/{spray/submodels => parcel/submodels/Spray}/StochasticCollision/TrajectoryCollision/TrajectoryCollision.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C (96%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C (98%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C (93%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H (96%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C (89%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C (100%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H (100%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C (99%) rename src/lagrangian/{intermediate => parcel}/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H (99%) rename src/lagrangian/{intermediate => parcel}/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C (89%) rename src/lagrangian/{intermediate => parcel}/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H (97%) rename src/lagrangian/{intermediate => parcel}/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C (92%) rename src/lagrangian/{intermediate => parcel}/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H (97%) create mode 100644 src/lagrangian/parcelTurbulence/Make/files rename src/lagrangian/{turbulence => parcelTurbulence}/Make/options (94%) rename src/lagrangian/{turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C => parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C} (89%) rename src/lagrangian/{turbulence/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C => parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C} (88%) rename src/lagrangian/{turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C => parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C} (88%) rename src/lagrangian/{turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C => parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C} (85%) rename src/lagrangian/{turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C => parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C} (86%) rename src/lagrangian/{turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C => parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C} (86%) create mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C rename src/lagrangian/{turbulence => parcelTurbulence}/parcels/include/makeParcelTurbulenceDispersionModels.H (91%) rename src/lagrangian/{turbulence => parcelTurbulence}/parcels/include/makeThermoParcelTurbulenceForces.H (96%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C (100%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C (100%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H (98%) rename src/lagrangian/{turbulence => parcelTurbulence}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H (96%) delete mode 100644 src/lagrangian/spray/Make/files delete mode 100644 src/lagrangian/spray/Make/options delete mode 100644 src/lagrangian/spray/clouds/baseClasses/sprayCloud/sprayCloud.H delete mode 100644 src/lagrangian/spray/parcels/derived/basicSprayParcel/defineBasicSprayParcel.C delete mode 100644 src/lagrangian/turbulence/Make/files rename tutorials/IO/fileHandler/constant/{kinematicCloudPositions => cloudPositions} (98%) rename tutorials/IO/fileHandler/constant/{kinematicCloudProperties => cloudProperties} (96%) delete mode 100644 tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties delete mode 100644 tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reactingCloud1Properties delete mode 100644 tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/p (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/p_rgh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/wallFilmRegion/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/wallFilmRegion/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/0/wallFilmRegion/delta (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/Allclean (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/Allmesh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/cylinder/constant/reactingCloud1Properties => buoyantReactingParticleFoam/cylinder/constant/cloudProperties} (85%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/constant/combustionProperties (100%) rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek => buoyantReactingParticleFoam/cylinder}/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => buoyantReactingParticleFoam/cylinder}/constant/parcelInjectionProperties (76%) rename tutorials/lagrangian/{reactingParcelFoam/counterFlowFlame2DLTS => buoyantReactingParticleFoam/cylinder}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/constant/surfaceFilmProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/createPatchDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/extrudeToRegionMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/topoSetDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/wallFilmRegion/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/cylinder/system/wallFilmRegion/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/alphat (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/epsilon (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/htcConv (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/k (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/nut (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/p (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/p_rgh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/wallFilmRegion/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/wallFilmRegion/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/0/wallFilmRegion/delta (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/Allclean (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/Allmesh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/Allrun-parallel (100%) rename tutorials/lagrangian/{reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties => buoyantReactingParticleFoam/hotBoxes/constant/cloudProperties} (91%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/constant/combustionProperties (100%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt => buoyantReactingParticleFoam/hotBoxes}/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/cylinder => buoyantReactingParticleFoam/hotBoxes}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter => buoyantReactingParticleFoam/hotBoxes}/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/constant/surfaceFilmProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter => buoyantReactingParticleFoam/hotBoxes}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/createObstacle.setSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/createWallFilmZone.setSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/patchify.setSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/patchifyObstacles (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/extrudeToRegionMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/topoSetDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/wallFilmRegion/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/wallFilmRegion/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/hotBoxes/system/wallFilmRegion/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/p (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/p_rgh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/wallFilmRegion/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/wallFilmRegion/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/0/wallFilmRegion/delta (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/Allclean (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/Allmesh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter => buoyantReactingParticleFoam/rivuletPanel}/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/cylinder => buoyantReactingParticleFoam/rivuletPanel}/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/constant/parcelInjectionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter => buoyantReactingParticleFoam/rivuletPanel}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/hotBoxes => buoyantReactingParticleFoam/rivuletPanel}/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/constant/surfaceFilmProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/hotBoxes => buoyantReactingParticleFoam/rivuletPanel}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/createWallFilmRegionPatches.setSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/createPatchDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/extrudeToRegionMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/wallFilmRegion.topoSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/wallFilmRegion/createPatchDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/wallFilmRegion/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/system/wallFilmRegion/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/rivuletPanel/wallFilmRegion.setSet (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/p (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/p_rgh (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/wallFilm/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/wallFilm/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/0/wallFilm/delta (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/Allclean (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel/constant/reactingCloud1Properties => buoyantReactingParticleFoam/splashPanel/constant/cloudProperties} (88%) rename tutorials/lagrangian/{reactingParcelFoam/parcelInBox => buoyantReactingParticleFoam/splashPanel}/constant/combustionProperties (100%) rename tutorials/lagrangian/{MPPICFoam/column => buoyantReactingParticleFoam/splashPanel}/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/constant/momentumTransport (100%) rename tutorials/{combustion/fireFoam/LES/smallPoolFire2D/constant/reactingCloud1Properties => lagrangian/buoyantReactingParticleFoam/splashPanel/constant/parcelInjectionProperties} (82%) rename tutorials/lagrangian/{reactingParcelFoam/hotBoxes => buoyantReactingParticleFoam/splashPanel}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/rivuletPanel => buoyantReactingParticleFoam/splashPanel}/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/constant/surfaceFilmProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/rivuletPanel => buoyantReactingParticleFoam/splashPanel}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/createPatchDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/extrudeToRegionMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/topoSetDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/wallFilm/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => buoyantReactingParticleFoam}/splashPanel/system/wallFilm/fvSolution (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/0/U.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/Goldschmidt/0/p (100%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt/constant/kinematicCloudPositions => denseParticleFoam/Goldschmidt/constant/cloudPositions} (99%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt/constant/kinematicCloudProperties => denseParticleFoam/Goldschmidt/constant/cloudProperties} (92%) rename tutorials/lagrangian/{reactingParcelFoam/hotBoxes => denseParticleFoam/Goldschmidt}/constant/g (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/constant/transportProperties (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/system/blockMeshDict (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/system/controlDict (94%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/Goldschmidt/system/decomposeParDict (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/system/fvSchemes (100%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/system/fvSolution (95%) rename tutorials/lagrangian/{DPMFoam => denseParticleFoam}/Goldschmidt/system/mapFieldsDict (100%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/0/U.air (100%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/0/p (91%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt/constant/kinematicCloudPositions => denseParticleFoam/GoldschmidtMPPIC/constant/cloudPositions} (99%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt/constant/kinematicCloudProperties => denseParticleFoam/GoldschmidtMPPIC/constant/cloudProperties} (96%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/constant/g (100%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/constant/transportProperties (100%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/system/blockMeshDict (100%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/system/controlDict (94%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/system/decomposeParDict (93%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/system/fvSchemes (95%) rename tutorials/lagrangian/{MPPICFoam/Goldschmidt => denseParticleFoam/GoldschmidtMPPIC}/system/fvSolution (95%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/0/U.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/0/p (100%) rename tutorials/lagrangian/{MPPICFoam/column/constant/kinematicCloudPositions => denseParticleFoam/column/constant/cloudPositions} (99%) rename tutorials/lagrangian/{MPPICFoam/column/constant/kinematicCloudProperties => denseParticleFoam/column/constant/cloudProperties} (96%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => denseParticleFoam/column}/constant/g (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/constant/transportProperties (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/system/blockMeshDict (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/system/controlDict (96%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/system/fvSchemes (95%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/column/system/fvSolution (95%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/0/U.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/0/k.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/0/nut.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/0/p (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/Allrun (91%) rename tutorials/lagrangian/{MPPICFoam/cyclone/constant/kinematicCloudProperties => denseParticleFoam/cyclone/constant/cloudProperties} (98%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/constant/g (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/constant/transportProperties (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/constant/triSurface/cyclone.stl.gz (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/blockMeshDict (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/controlDict (96%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/decomposeParDict (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/fvSchemes (95%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/fvSolution (95%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/cyclone/system/snappyHexMeshDict (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/0/U.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/0/p (100%) rename tutorials/lagrangian/{MPPICFoam/injectionChannel/constant/kinematicCloudProperties => denseParticleFoam/injectionChannel/constant/cloudProperties} (98%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/constant/g (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/constant/transportProperties (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/system/blockMeshDict (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/system/controlDict (96%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/system/fvSchemes (100%) rename tutorials/lagrangian/{MPPICFoam => denseParticleFoam}/injectionChannel/system/fvSolution (96%) rename tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/{kinematicCloudProperties => cloudProperties} (97%) rename tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/{kinematicCloudPositions => cloudPositions} (99%) rename tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/{kinematicCloudProperties => cloudProperties} (96%) rename tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/{kinematicCloudPositions => cloudPositions} (99%) rename tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/{kinematicCloudProperties => cloudProperties} (96%) delete mode 100644 tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties delete mode 100644 tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p delete mode 100644 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties delete mode 100644 tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p delete mode 100644 tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/N2 (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/O2 (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/T (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/U (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/Ydefault (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/alphat (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/epsilon (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/k (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/nut (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/0/p (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/Allclean (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/Allrun (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/chemkin/chem.inp (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/chemkin/therm.dat (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/chemkin/transportProperties (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/constant/chemistryProperties (100%) rename tutorials/lagrangian/{sprayFoam/aachenBomb/constant/sprayCloudProperties => reactingParticleFoam/aachenBomb/constant/cloudProperties} (98%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/constant/combustionProperties (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/constant/g (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/parcelInBox => reactingParticleFoam/aachenBomb}/constant/radiationProperties (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/constant/thermophysicalProperties (96%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/system/blockMeshDict (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/system/controlDict (96%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/system/fvSchemes (100%) rename tutorials/lagrangian/{sprayFoam => reactingParticleFoam}/aachenBomb/system/fvSolution (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/CH4 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/CO2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/nut (100%) rename tutorials/lagrangian/{reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh => reactingParticleFoam/counterFlowFlame2DLTS/0/p} (93%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/0/rho (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/chemistryProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/rivuletPanel => reactingParticleFoam/counterFlowFlame2DLTS}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/reactions (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/thermo.compressibleGas (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/counterFlowFlame2DLTS/system/fvSolution (97%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/G (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/N2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/O2 (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/alphat (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/epsilon (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/k (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/0.orig/nut (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter/0.orig/p_rgh => reactingParticleFoam/filter/0.orig/p} (92%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/Allclean (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/filter/constant/reactingCloud1Properties => reactingParticleFoam/filter/constant/cloudProperties} (88%) rename tutorials/lagrangian/{reactingParcelFoam/rivuletPanel => reactingParticleFoam/filter}/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/constant/fvOptions (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/cylinder => reactingParticleFoam/filter}/constant/parcelInjectionProperties (70%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/constant/particleTrackProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => reactingParticleFoam/filter}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => reactingParticleFoam/filter}/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => reactingParticleFoam/filter}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/createBafflesDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/decomposeParDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/fvSolution (97%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/filter/system/topoSetDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/0/G (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/0/U (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/0/air (100%) rename tutorials/lagrangian/{reactingParcelFoam/parcelInBox/0/p_rgh => reactingParticleFoam/parcelInBox/0/p} (91%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/README (100%) rename tutorials/lagrangian/{reactingParcelFoam/parcelInBox/constant/reactingCloud1Positions => reactingParticleFoam/parcelInBox/constant/cloudPositions} (100%) rename tutorials/lagrangian/{reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties => reactingParticleFoam/parcelInBox/constant/cloudProperties} (87%) rename tutorials/lagrangian/{reactingParcelFoam/splashPanel => reactingParticleFoam/parcelInBox}/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannel => reactingParticleFoam/parcelInBox}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/system/controlDict (96%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/system/fvSolution (97%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/parcelInBox/system/probesDict (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/CH4 (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/CO (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/CO2 (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/G (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/H2 (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/H2O (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/N2 (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/O2 (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/T (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/U (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/alphat (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/epsilon (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/k (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/nut (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/0/p.orig (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/Allrun (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/chemistryProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties => reactingParticleFoam/simplifiedSiwek/constant/clouds} (85%) rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions => reactingParticleFoam/simplifiedSiwek/constant/coalCloudPositions} (100%) rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties => reactingParticleFoam/simplifiedSiwek/constant/coalCloudProperties} (97%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/combustionProperties (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/fvOptions (100%) rename tutorials/lagrangian/{reactingParcelFoam/rivuletPanel => reactingParticleFoam/simplifiedSiwek}/constant/g (100%) rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/limestonePositions => reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudPositions} (100%) rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties => reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudProperties} (95%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/momentumTransport (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/radiationProperties (92%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/reactions (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/speciesThermo (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/constant/thermophysicalProperties (97%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/blockMeshDict (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/controlDict (96%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/decomposeParDict (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/fvSchemes (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/fvSolution (100%) rename tutorials/lagrangian/{coalChemistryFoam => reactingParticleFoam}/simplifiedSiwek/system/topoSetDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/U.orig (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/air (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/alphat (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/k (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/nut (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/0/omega (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannel/0/p_rgh => reactingParticleFoam/verticalChannel/0/p} (91%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties => reactingParticleFoam/verticalChannel/constant/cloudProperties} (91%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/particleTrackProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannelLTS => reactingParticleFoam/verticalChannel}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/system/controlDict (97%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannel/system/fvSolution (96%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/H2O (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/T (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/U.orig (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/air (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/alphat (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/k (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/nut (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/0/omega (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannelLTS/0/p_rgh => reactingParticleFoam/verticalChannelLTS/0/p} (91%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/Allrun (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties => reactingParticleFoam/verticalChannelLTS/constant/cloudProperties} (92%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/combustionProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/g (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/momentumTransport (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/particleTrackDict (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam/verticalChannel => reactingParticleFoam/verticalChannelLTS}/constant/radiationProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/speciesThermo (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/system/blockMeshDict (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/system/controlDict (97%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/system/fvSchemes (100%) rename tutorials/lagrangian/{reactingParcelFoam => reactingParticleFoam}/verticalChannelLTS/system/fvSolution (96%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/H2O (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/T (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/U.orig (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/air (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/alphat (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/k (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/nut (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/omega (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/0/p (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/Allrun (100%) rename tutorials/lagrangian/{reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties => simpleReactingParticleFoam/verticalChannel/constant/cloudProperties} (98%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/combustionProperties (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/g (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/momentumTransport (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/particleTrackDict (100%) rename tutorials/lagrangian/{sprayFoam/aachenBomb => simpleReactingParticleFoam/verticalChannel}/constant/radiationProperties (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/speciesThermo (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/system/blockMeshDict (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/system/controlDict (97%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/system/fvSchemes (100%) rename tutorials/lagrangian/{simpleReactingParcelFoam => simpleReactingParticleFoam}/verticalChannel/system/fvSolution (100%) diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index 4149fa9f81..e44d74a6dc 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) #include "createFieldRefs.H" #include "createRhoUf.H" #include "initContinuityErrs.H" - #include "readEngineTimeControls.H" + #include "createEngineTimeControls.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" #include "startSummary.H" diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 2230b572ee..3783cbf21d 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) #include "createFieldRefs.H" #include "createRhoUf.H" #include "initContinuityErrs.H" - #include "readEngineTimeControls.H" + #include "createEngineTimeControls.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" #include "startSummary.H" diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 85f90f3232..bddc3aa373 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -18,7 +18,7 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude EXE_LIBS = \ @@ -40,6 +40,6 @@ EXE_LIBS = \ -lradiationModels \ -lsurfaceFilmModels \ -lsurfaceFilmDerivedFvPatchFields \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lODE diff --git a/applications/solvers/combustion/fireFoam/createClouds.H b/applications/solvers/combustion/fireFoam/createClouds.H index c568be12a1..8ea23b2181 100644 --- a/applications/solvers/combustion/fireFoam/createClouds.H +++ b/applications/solvers/combustion/fireFoam/createClouds.H @@ -1,9 +1,2 @@ -Info<< "\nConstructing reacting cloud" << endl; -basicReactingCloud parcels -( - "reactingCloud1", - rho, - U, - g, - slgThermo -); +Info<< "\nConstructing clouds" << endl; +parcelCloudList parcels(rho, U, g, slgThermo); diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index d8a6faa145..8234d82ae3 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" #include "psiReactionThermophysicalTransportModel.H" -#include "basicReactingCloud.H" +#include "parcelCloudList.H" #include "surfaceFilmModel.H" #include "radiationModel.H" #include "SLGThermo.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C deleted file mode 100644 index f0fb67f3ca..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ /dev/null @@ -1,171 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - DPMFoam - -Description - Transient solver for the coupled transport of a single kinematic particle - cloud including the effect of the volume fraction of particles on the - continuous phase, with optional mesh motion and mesh topology changes. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "singlePhaseTransportModel.H" -#include "PhaseIncompressibleMomentumTransportModel.H" -#include "pimpleControl.H" -#include "CorrectPhi.H" -#include "fvOptions.H" - -#ifdef MPPIC - #include "basicKinematicMPPICCloud.H" - #define basicKinematicTypeCloud basicKinematicMPPICCloud -#else - #include "basicKinematicCollidingCloud.H" - #define basicKinematicTypeCloud basicKinematicCollidingCloud -#endif - -int main(int argc, char *argv[]) -{ - argList::addOption - ( - "cloudName", - "name", - "specify alternative cloud name. default is 'kinematicCloud'" - ); - - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "createDyMControls.H" - #include "createFields.H" - #include "createUcfIfPresent.H" - #include "initContinuityErrs.H" - - Info<< "\nStarting time loop\n" << endl; - - while (pimple.run(runTime)) - { - #include "readDyMControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // Store the particle positions - kinematicCloud.storeGlobalPositions(); - - mesh.update(); - - if (mesh.changing()) - { - if (correctPhi) - { - // Calculate absolute flux from the mapped surface velocity - phic = mesh.Sf() & Ucf(); - - #include "correctPhic.H" - - // Make the flux relative to the mesh motion - fvc::makeRelative(phic, Uc); - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } - } - - continuousPhaseTransport.correct(); - muc = rhoc*continuousPhaseTransport.nu(); - - Info<< "Evolving " << kinematicCloud.name() << endl; - kinematicCloud.evolve(); - - // Update continuous phase volume fraction field - alphac = max(1.0 - kinematicCloud.theta(), alphacMin); - alphac.correctBoundaryConditions(); - alphacf = fvc::interpolate(alphac); - alphaPhic = alphacf*phic; - - fvVectorMatrix cloudSU(kinematicCloud.SU(Uc)); - volVectorField cloudVolSUSu - ( - IOobject - ( - "cloudVolSUSu", - runTime.timeName(), - mesh - ), - mesh, - dimensionedVector - ( - "0", - cloudSU.dimensions()/dimVolume, - Zero - ), - zeroGradientFvPatchVectorField::typeName - ); - - cloudVolSUSu.primitiveFieldRef() = - (cloudSU.diag()*Uc() - cloudSU.source())/mesh.V(); - cloudVolSUSu.correctBoundaryConditions(); - cloudSU.source() = cloudSU.diag()*Uc(); - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "UcEqn.H" - - // --- PISO loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - continuousPhaseTurbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files deleted file mode 100644 index d7245a6438..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -DPMMomentumTransportModels.C - -LIB = $(FOAM_LIBBIN)/libDPMMomentumTransportModels diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C deleted file mode 100644 index eae7b96eec..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/MPPICFoam.C +++ /dev/null @@ -1,40 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - MPPICFoam - -Description - Transient solver for the coupled transport of a single kinematic particle - cloud including the effect of the volume fraction of particles on the - continuous phase. Multi-Phase Particle In Cell (MPPIC) modeling is used to - represent collisions without resolving particle-particle interactions. - -\*---------------------------------------------------------------------------*/ - -#define MPPIC - -#include "DPMFoam.C" - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/files b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/files deleted file mode 100644 index d311f5a33c..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -MPPICFoam.C - -EXE = $(FOAM_APPBIN)/MPPICFoam diff --git a/applications/solvers/lagrangian/DPMFoam/Make/files b/applications/solvers/lagrangian/DPMFoam/Make/files deleted file mode 100644 index c4d729205d..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -DPMFoam.C - -EXE = $(FOAM_APPBIN)/DPMFoam diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options deleted file mode 100644 index 8553deca6e..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ /dev/null @@ -1,31 +0,0 @@ -EXE_INC = \ - -I./DPMMomentumTransportModels/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -lincompressibleTransportModels \ - -lmomentumTransportModels \ - -lincompressibleMomentumTransportModels \ - -lDPMMomentumTransportModels \ - -lfiniteVolume \ - -ldynamicFvMesh \ - -ltopoChangerFvMesh \ - -lfvOptions \ - -lmeshTools diff --git a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H deleted file mode 100644 index 26308cb160..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H +++ /dev/null @@ -1,41 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) - + fvc::ddt(rho, K) + fvc::div(phi, K) - + ( - he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) - : -dpdt - ) - + thermophysicalTransport->divq(he) - == - rho*(U&g) - + combustion->Qdot() - + coalParcels.Sh(he) - + limestoneParcels.Sh(he) - + radiation->Sh(thermo, he) - + fvOptions(rho, he) - ); - - EEqn.relax(); - - fvOptions.constrain(EEqn); - - EEqn.solve(); - - fvOptions.correct(he); - - thermo.correct(); - radiation->correct(); - - Info<< "T gas min/max = " << min(T).value() << ", " - << max(T).value() << endl; -} diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/files b/applications/solvers/lagrangian/coalChemistryFoam/Make/files deleted file mode 100644 index 552d734501..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -coalChemistryFoam.C - -EXE = $(FOAM_APPBIN)/coalChemistryFoam diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options deleted file mode 100644 index b2adc8faae..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ /dev/null @@ -1,49 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(FOAM_SOLVERS)/combustion/reactingFoam \ - -I$(LIB_SRC)/sampling/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ - -lthermophysicalTransportModels \ - -lpsiReactionThermophysicalTransportModels \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -lcoalCombustion\ - -lspecie \ - -lfluidThermophysicalModels \ - -lthermophysicalProperties \ - -lreactionThermophysicalModels \ - -lSLGThermo \ - -lchemistryModel \ - -lradiationModels \ - -lregionModels \ - -lsurfaceFilmModels \ - -lODE \ - -lcombustionModels \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H deleted file mode 100644 index 04ff49768b..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H +++ /dev/null @@ -1,49 +0,0 @@ -tmp> mvConvection -( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) -); - - -{ - combustion->correct(); - volScalarField Yt(0.0*Y[0]); - - forAll(Y, i) - { - if (i != inertIndex && composition.active(i)) - { - volScalarField& Yi = Y[i]; - - fvScalarMatrix YiEqn - ( - fvm::ddt(rho, Yi) - + mvConvection->fvmDiv(phi, Yi) - + thermophysicalTransport->divj(Yi) - == - coalParcels.SYi(i, Yi) - + combustion->R(Yi) - + fvOptions(rho, Yi) - ); - - YiEqn.relax(); - - fvOptions.constrain(YiEqn); - - YiEqn.solve("Yi"); - - fvOptions.correct(Yi); - - Yi.max(0.0); - Yt += Yi; - } - } - - Y[inertIndex] = scalar(1) - Yt; - Y[inertIndex].max(0.0); -} diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H b/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H deleted file mode 100644 index 5dcfe1df4f..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/createClouds.H +++ /dev/null @@ -1,19 +0,0 @@ -Info<< "\nConstructing coal cloud" << endl; -coalCloud coalParcels -( - "coalCloud1", - rho, - U, - g, - slgThermo -); - -Info<< "\nConstructing limestone cloud" << endl; -basicThermoCloud limestoneParcels -( - "limestoneCloud1", - rho, - U, - g, - slgThermo -); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H b/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H deleted file mode 100644 index 4748421aa4..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFieldRefs.H +++ /dev/null @@ -1 +0,0 @@ -const label inertIndex(composition.species()[inertSpecie]); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H deleted file mode 100644 index 0c51864b8d..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ /dev/null @@ -1,141 +0,0 @@ -#include "createRDeltaT.H" - -#include "readGravitationalAcceleration.H" - -Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(psiReactionThermo::New(mesh)); -psiReactionThermo& thermo = pThermo(); -thermo.validate(args.executable(), "h", "e"); - -SLGThermo slgThermo(mesh, thermo); - -basicSpecieMixture& composition = thermo.composition(); -PtrList& Y = composition.Y(); - -const word inertSpecie(thermo.lookup("inertSpecie")); -if (!composition.species().found(inertSpecie)) -{ - FatalIOErrorIn(args.executable().c_str(), thermo) - << "Inert specie " << inertSpecie << " not found in available species " - << composition.species() - << exit(FatalIOError); -} - -volScalarField& p = thermo.p(); -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); - -multivariateSurfaceInterpolationScheme::fieldTable fields; - -forAll(Y, i) -{ - fields.add(Y[i]); -} -fields.add(thermo.he()); - -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - thermo.rho() -); - -// lagrangian effective density field - used externally (optional) -volScalarField rhoEffLagrangian -( - IOobject - ( - "rhoEffLagrangian", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar(dimDensity, 0) -); - -// dynamic pressure field - used externally (optional) -volScalarField pDyn -( - IOobject - ( - "pDyn", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar(dimPressure, 0) -); - - -Info<< "\nReading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "compressibleCreatePhi.H" - -mesh.setFluxRequired(p.name()); - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - compressible::momentumTransportModel::New - ( - rho, - U, - phi, - thermo - ) -); - -Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport -( - psiReactionThermophysicalTransportModel::New(turbulence(), thermo) -); - -Info<< "Creating combustion model\n" << endl; -autoPtr> combustion -( - CombustionModel::New(thermo, turbulence()) -); - -Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt -( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar(p.dimensions()/dimTime, 0) -); - -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); - -#include "createMRF.H" -#include "createClouds.H" -#include "createRadiationModel.H" -#include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H deleted file mode 100644 index bedd635180..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H +++ /dev/null @@ -1,93 +0,0 @@ -rho = thermo.rho(); - -volScalarField rAU(1.0/UEqn.A()); -surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); - -if (pimple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi) - *( - fvc::flux(HbyA) - + MRF.zeroFilter - ( - rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho) - ) - ) - ); - - MRF.makeRelative(fvc::interpolate(psi), phid); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvm::div(phid, p) - - fvm::laplacian(rhorAUf, p) - == - coalParcels.Srho() - + fvOptions(psi, p, rho.name()) - ); - - pEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi == pEqn.flux(); - } - } -} -else -{ - surfaceScalarField phiHbyA - ( - "phiHbyA", - ( - fvc::flux(rho*HbyA) - + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi)) - ) - ); - - MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - - // Update the pressure BCs to ensure flux consistency - constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvc::div(phiHbyA) - - fvm::laplacian(rhorAUf, p) - == - coalParcels.Srho() - + fvOptions(psi, p, rho.name()) - ); - - pEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA + pEqn.flux(); - } - } -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -U = HbyA - rAU*fvc::grad(p); -U.correctBoundaryConditions(); -fvOptions.correct(U); - -K = 0.5*magSqr(U); - -if (thermo.dpdt()) -{ - dpdt = fvc::ddt(p); -} diff --git a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H deleted file mode 100644 index cb1cead6c2..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Global - rhoEqn - -Description - Solve the continuity for density. - -\*---------------------------------------------------------------------------*/ - -{ - fvScalarMatrix rhoEqn - ( - fvm::ddt(rho) - + fvc::div(phi) - == - coalParcels.Srho(rho) - + fvOptions(rho) - ); - - rhoEqn.solve(); - - fvOptions.correct(rho); -} - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H deleted file mode 100644 index cb7b7b9a3b..0000000000 --- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H +++ /dev/null @@ -1,135 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -{ - volScalarField& rDeltaT = trDeltaT.ref(); - - const dictionary& pimpleDict = pimple.dict(); - - // Maximum flow Courant number - scalar maxCo(pimpleDict.lookup("maxCo")); - - // Maximum time scale - scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", great)); - - // Smoothing parameter (0-1) when smoothing iterations > 0 - scalar rDeltaTSmoothingCoeff - ( - pimpleDict.lookupOrDefault("rDeltaTSmoothingCoeff", 0.1) - ); - - // Damping coefficient (1-0) - scalar rDeltaTDampingCoeff - ( - pimpleDict.lookupOrDefault("rDeltaTDampingCoeff", 0.2) - ); - - // Maximum change in cell temperature per iteration - // (relative to previous value) - scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05)); - - - Info<< "Time scales min/max:" << endl; - - // Cache old reciprocal time scale field - volScalarField rDeltaT0("rDeltaT0", rDeltaT); - - // Flow time scale - { - rDeltaT.ref() = - ( - fvc::surfaceSum(mag(phi))()() - /((2*maxCo)*mesh.V()*rho()) - ); - - // Limit the largest time scale - rDeltaT.max(1/maxDeltaT); - - Info<< " Flow = " - << gMin(1/rDeltaT.primitiveField()) << ", " - << gMax(1/rDeltaT.primitiveField()) << endl; - } - - // Reaction source time scale - { - volScalarField::Internal rDeltaTT - ( - mag - ( - (coalParcels.hsTrans() + limestoneParcels.hsTrans()) - /(mesh.V()*runTime.deltaT()) - + combustion->Qdot()() - ) - /( - alphaTemp - *rho() - *thermo.Cp()()() - *T() - ) - ); - - Info<< " Temperature = " - << gMin(1/(rDeltaTT.field() + vSmall)) << ", " - << gMax(1/(rDeltaTT.field() + vSmall)) << endl; - - rDeltaT.ref() = max - ( - rDeltaT(), - rDeltaTT - ); - } - - // Update the boundary values of the reciprocal time-step - rDeltaT.correctBoundaryConditions(); - - // Spatially smooth the time scale field - if (rDeltaTSmoothingCoeff < 1.0) - { - fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff); - } - - // Limit rate of change of time scale - // - reduce as much as required - // - only increase at a fraction of old time scale - if - ( - rDeltaTDampingCoeff < 1.0 - && runTime.timeIndex() > runTime.startTimeIndex() + 1 - ) - { - rDeltaT = max - ( - rDeltaT, - (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 - ); - } - - Info<< " Overall = " - << gMin(1/rDeltaT.primitiveField()) - << ", " << gMax(1/rDeltaT.primitiveField()) << endl; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/DPMFoam/Allwclean b/applications/solvers/lagrangian/denseParticleFoam/Allwclean similarity index 76% rename from applications/solvers/lagrangian/DPMFoam/Allwclean rename to applications/solvers/lagrangian/denseParticleFoam/Allwclean index 4575cd0537..a5c588e6f9 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwclean +++ b/applications/solvers/lagrangian/denseParticleFoam/Allwclean @@ -1,7 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory -wclean libso DPMMomentumTransportModels +wclean libso denseParticleMomentumTransportModels wclean wclean MPPICFoam diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/denseParticleFoam/Allwmake similarity index 78% rename from applications/solvers/lagrangian/DPMFoam/Allwmake rename to applications/solvers/lagrangian/denseParticleFoam/Allwmake index 5ccc25ffe8..d01195794f 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwmake +++ b/applications/solvers/lagrangian/denseParticleFoam/Allwmake @@ -4,9 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -wmake $targetType DPMMomentumTransportModels +wmake $targetType denseParticleMomentumTransportModels wmake $targetType -wmake $targetType MPPICFoam #------------------------------------------------------------------------------ diff --git a/applications/solvers/lagrangian/DPMFoam/CourantNo.H b/applications/solvers/lagrangian/denseParticleFoam/CourantNo.H similarity index 96% rename from applications/solvers/lagrangian/DPMFoam/CourantNo.H rename to applications/solvers/lagrangian/denseParticleFoam/CourantNo.H index 504ac90b73..f0ef70106c 100644 --- a/applications/solvers/lagrangian/DPMFoam/CourantNo.H +++ b/applications/solvers/lagrangian/denseParticleFoam/CourantNo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/denseParticleFoam/Make/files b/applications/solvers/lagrangian/denseParticleFoam/Make/files new file mode 100644 index 0000000000..2bd83594aa --- /dev/null +++ b/applications/solvers/lagrangian/denseParticleFoam/Make/files @@ -0,0 +1,3 @@ +denseParticleFoam.C + +EXE = $(FOAM_APPBIN)/denseParticleFoam diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/denseParticleFoam/Make/options similarity index 83% rename from applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options rename to applications/solvers/lagrangian/denseParticleFoam/Make/options index 74755c40b2..a258cd1f13 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/denseParticleFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I.. \ - -I../DPMMomentumTransportModels/lnInclude \ + -I./denseParticleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -19,12 +18,12 @@ EXE_INC = \ EXE_LIBS = \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lincompressibleTransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lDPMMomentumTransportModels \ + -ldenseParticleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/lagrangian/DPMFoam/UcEqn.H b/applications/solvers/lagrangian/denseParticleFoam/UcEqn.H similarity index 51% rename from applications/solvers/lagrangian/DPMFoam/UcEqn.H rename to applications/solvers/lagrangian/denseParticleFoam/UcEqn.H index 12c6f8fbab..829fdca9b9 100644 --- a/applications/solvers/lagrangian/DPMFoam/UcEqn.H +++ b/applications/solvers/lagrangian/denseParticleFoam/UcEqn.H @@ -12,11 +12,17 @@ UcEqn.relax(); fvOptions.constrain(UcEqn); volScalarField rAUc(1.0/UcEqn.A()); -surfaceScalarField rAUcf("Dp", fvc::interpolate(rAUc)); +volScalarField rASpUc(1.0/(UcEqn.A() - cloudSUp/rhoc)); +surfaceScalarField rASpUcf("Dp", fvc::interpolate(rASpUc)); -surfaceScalarField phicForces +surfaceScalarField phicSUSu ( - fvc::flux(rAUc*cloudVolSUSu/rhoc) + rAUcf*(g & mesh.Sf()) + fvc::flux(rASpUc*cloudSUu/rhoc) + + rASpUcf*(g & mesh.Sf()) +); +surfaceScalarField phicSUSp +( + fvc::interpolate(rASpUc*cloudSUp/rhoc) ); if (pimple.momentumPredictor()) @@ -27,8 +33,10 @@ if (pimple.momentumPredictor()) == fvc::reconstruct ( - phicForces/rAUcf - fvc::snGrad(p)*mesh.magSf() + (phicSUSu + phicSUSp*phic)/rASpUcf + - fvc::snGrad(p)*mesh.magSf() ) + + (1.0/rhoc)*(fvm::Sp(cloudSUp, Uc) - cloudSUp*Uc) ); fvOptions.correct(Uc); diff --git a/applications/solvers/lagrangian/DPMFoam/continuityErrs.H b/applications/solvers/lagrangian/denseParticleFoam/continuityErrs.H similarity index 96% rename from applications/solvers/lagrangian/DPMFoam/continuityErrs.H rename to applications/solvers/lagrangian/denseParticleFoam/continuityErrs.H index 980f9919f6..792b8a6aad 100644 --- a/applications/solvers/lagrangian/DPMFoam/continuityErrs.H +++ b/applications/solvers/lagrangian/denseParticleFoam/continuityErrs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/DPMFoam/correctPhic.H b/applications/solvers/lagrangian/denseParticleFoam/correctPhic.H similarity index 100% rename from applications/solvers/lagrangian/DPMFoam/correctPhic.H rename to applications/solvers/lagrangian/denseParticleFoam/correctPhic.H diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/denseParticleFoam/createFields.H similarity index 87% rename from applications/solvers/lagrangian/DPMFoam/createFields.H rename to applications/solvers/lagrangian/denseParticleFoam/createFields.H index eefdfd0576..55aac63f32 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createFields.H @@ -122,29 +122,17 @@ volScalarField alphac dimensionedScalar(dimless, 0) ); -word kinematicCloudName("kinematicCloud"); -args.optionReadIfPresent("cloudName", kinematicCloudName); - -Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; -basicKinematicTypeCloud kinematicCloud -( - kinematicCloudName, - rhoc, - Uc, - muc, - g -); +Info<< "Constructing clouds" << endl; +parcelCloudList clouds(rhoc, Uc, muc, g); // Particle fraction upper limit scalar alphacMin ( - 1.0 - - kinematicCloud.particleProperties().subDict("constantProperties") - .lookup("alphaMax") + 1 - mesh.solverDict(alphac.name()).lookup("max") ); // Update alphac from the particle locations -alphac = max(1.0 - kinematicCloud.theta(), alphacMin); +alphac = max(1.0 - clouds.theta(), alphacMin); alphac.correctBoundaryConditions(); surfaceScalarField alphacf("alphacf", fvc::interpolate(alphac)); diff --git a/applications/solvers/lagrangian/DPMFoam/createUcf.H b/applications/solvers/lagrangian/denseParticleFoam/createUcf.H similarity index 96% rename from applications/solvers/lagrangian/DPMFoam/createUcf.H rename to applications/solvers/lagrangian/denseParticleFoam/createUcf.H index 730250cf52..10d84b25a9 100644 --- a/applications/solvers/lagrangian/DPMFoam/createUcf.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createUcf.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/DPMFoam/createUcfIfPresent.H b/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H similarity index 96% rename from applications/solvers/lagrangian/DPMFoam/createUcfIfPresent.H rename to applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H index 61231b1030..5c822ec16f 100644 --- a/applications/solvers/lagrangian/DPMFoam/createUcfIfPresent.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createUcfIfPresent.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C new file mode 100644 index 0000000000..6cdd89e17f --- /dev/null +++ b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C @@ -0,0 +1,241 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + denseParticleFoam + +Description + Transient solver for the coupled transport of particle clouds including the + effect of the volume fraction of particles on the continuous phase, with + optional mesh motion and mesh topology changes. + +\*---------------------------------------------------------------------------*/ + +#include "NamedEnum.H" + +namespace Foam +{ + enum class cloudForceSplit + { + faceExplicitCellImplicit, // Implicit part of the cloud force added to + // the cell momentum equation. Explicit part + // to the face momentum equation. This is the + // least likely to create staggering patterns + // in the velocity field, but it can create + // unphysical perturbations in cell + // velocities even when particles and flow + // have the similar velocities. + + faceExplicitCellLagged, // Entire cloud force evaluated explicitly + // and added to the face momentum equation. + // Lagged correction (i.e., + // fvm::Sp(cloudSU.diag(), Uc) - + // cloudSU.diag()*Uc) added to the cell + // momentum equation. This creates physical + // cell velocities when particles and flow + // have the same velocity, but can also + // result in staggering patterns in packed + // beds. Unsuitable for MPPIC. + + faceImplicit // Implicit and explicit parts of the force + // both added to the face momentum equation. + // Behaves somewhere between the other two. + }; + + template<> + const char* NamedEnum::names[] = + { + "faceExplicitCellImplicit", + "faceExplicitCellLagged", + "faceImplicit" + }; + + const NamedEnum cloudForceSplitNames; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "fvCFD.H" +#include "dynamicFvMesh.H" +#include "singlePhaseTransportModel.H" +#include "PhaseIncompressibleMomentumTransportModel.H" +#include "pimpleControl.H" +#include "CorrectPhi.H" +#include "fvOptions.H" +#include "parcelCloudList.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +int main(int argc, char *argv[]) +{ + #include "postProcess.H" + + #include "setRootCaseLists.H" + #include "createTime.H" + #include "createDynamicFvMesh.H" + #include "createDyMControls.H" + #include "createFields.H" + #include "createUcfIfPresent.H" + #include "initContinuityErrs.H" + + Info<< "\nStarting time loop\n" << endl; + + while (pimple.run(runTime)) + { + #include "readDyMControls.H" + #include "CourantNo.H" + #include "setDeltaT.H" + + runTime++; + + Info<< "Time = " << runTime.timeName() << nl << endl; + + // Store the particle positions + clouds.storeGlobalPositions(); + + mesh.update(); + + if (mesh.changing()) + { + if (correctPhi) + { + // Calculate absolute flux from the mapped surface velocity + phic = mesh.Sf() & Ucf(); + + #include "correctPhic.H" + + // Make the flux relative to the mesh motion + fvc::makeRelative(phic, Uc); + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + + continuousPhaseTransport.correct(); + muc = rhoc*continuousPhaseTransport.nu(); + + clouds.evolve(); + + // Update continuous phase volume fraction field + alphac = max(1.0 - clouds.theta(), alphacMin); + alphac.correctBoundaryConditions(); + alphacf = fvc::interpolate(alphac); + alphaPhic = alphacf*phic; + + // Cloud forces + fvVectorMatrix cloudSU(clouds.SU(Uc)); + volVectorField cloudSUu + ( + IOobject + ( + "cloudSUu", + runTime.timeName(), + mesh + ), + mesh, + dimensionedVector(dimForce/dimVolume, Zero), + zeroGradientFvPatchVectorField::typeName + ); + volScalarField cloudSUp + ( + IOobject + ( + "cloudSUp", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar(dimForce/dimVelocity/dimVolume, Zero), + zeroGradientFvPatchVectorField::typeName + ); + + const cloudForceSplit cloudSUSplit = + pimple.dict().found("cloudForceSplit") + ? cloudForceSplitNames.read(pimple.dict().lookup("cloudForceSplit")) + : cloudForceSplit::faceExplicitCellImplicit; + + switch (cloudSUSplit) + { + case cloudForceSplit::faceExplicitCellImplicit: + cloudSUu.primitiveFieldRef() = -cloudSU.source()/mesh.V(); + cloudSUu.correctBoundaryConditions(); + cloudSUp.primitiveFieldRef() = Zero; + cloudSUp.correctBoundaryConditions(); + //cloudSU.diag() = cloudSU.diag(); + cloudSU.source() = Zero; + break; + + case cloudForceSplit::faceExplicitCellLagged: + cloudSUu.primitiveFieldRef() = + (cloudSU.diag()*Uc() - cloudSU.source())/mesh.V(); + cloudSUu.correctBoundaryConditions(); + cloudSUp.primitiveFieldRef() = Zero; + cloudSUp.correctBoundaryConditions(); + //cloudSU.diag() = cloudSU.diag(); + cloudSU.source() = cloudSU.diag()*Uc(); + break; + + case cloudForceSplit::faceImplicit: + cloudSUu.primitiveFieldRef() = -cloudSU.source()/mesh.V(); + cloudSUu.correctBoundaryConditions(); + cloudSUp.primitiveFieldRef() = cloudSU.diag()/mesh.V(); + cloudSUp.correctBoundaryConditions(); + cloudSU.diag() = Zero; + cloudSU.source() = Zero; + break; + } + + // --- Pressure-velocity PIMPLE corrector loop + while (pimple.loop()) + { + #include "UcEqn.H" + + // --- PISO loop + while (pimple.correct()) + { + #include "pEqn.H" + } + + if (pimple.turbCorr()) + { + continuousPhaseTurbulence->correct(); + } + } + + runTime.write(); + + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; + } + + Info<< "End\n" << endl; + + return 0; +} + + +// ************************************************************************* // diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files new file mode 100644 index 0000000000..c2020ca982 --- /dev/null +++ b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files @@ -0,0 +1,3 @@ +denseParticleMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libdenseParticleMomentumTransportModels diff --git a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options similarity index 100% rename from applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options rename to applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options diff --git a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C similarity index 100% rename from applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C rename to applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C diff --git a/applications/solvers/lagrangian/DPMFoam/pEqn.H b/applications/solvers/lagrangian/denseParticleFoam/pEqn.H similarity index 50% rename from applications/solvers/lagrangian/DPMFoam/pEqn.H rename to applications/solvers/lagrangian/denseParticleFoam/pEqn.H index 7c3206ee99..9f60a24628 100644 --- a/applications/solvers/lagrangian/DPMFoam/pEqn.H +++ b/applications/solvers/lagrangian/denseParticleFoam/pEqn.H @@ -1,35 +1,37 @@ { volVectorField HbyA(constrainHbyA(rAUc*UcEqn.H(), Uc, p)); + volVectorField HbyASp(rASpUc/rAUc*HbyA); - surfaceScalarField phiHbyA + surfaceScalarField phiHbyASp ( - "phiHbyA", + "phiHbyASp", ( - fvc::flux(HbyA) - + alphacf*rAUcf*fvc::ddtCorr(Uc, phic, Ucf) + fvc::flux(HbyASp) + + alphacf*rASpUcf*fvc::ddtCorr(Uc, phic, Ucf) ) ); if (p.needReference()) { - fvc::makeRelative(phiHbyA, Uc); - adjustPhi(phiHbyA, Uc, p); - fvc::makeAbsolute(phiHbyA, Uc); + fvc::makeRelative(phiHbyASp, Uc); + adjustPhi(phiHbyASp, Uc, p); + fvc::makeAbsolute(phiHbyASp, Uc); } - phiHbyA += phicForces; + phiHbyASp += phicSUSu; // Update the pressure BCs to ensure flux consistency - constrainPressure(p, Uc, phiHbyA, rAUcf); + constrainPressure(p, Uc, phiHbyASp, rASpUcf); // Non-orthogonal pressure corrector loop while (pimple.correctNonOrthogonal()) { fvScalarMatrix pEqn ( - fvm::laplacian(alphacf*rAUcf, p) + fvm::laplacian(alphacf*rASpUcf, p) == - fvc::ddt(alphac) + fvc::div(alphacf*phiHbyA) + fvc::ddt(alphac) + + fvc::div(alphacf*phiHbyASp) ); pEqn.setReference(pRefCell, pRefValue); @@ -38,13 +40,18 @@ if (pimple.finalNonOrthogonalIter()) { - phic = phiHbyA - pEqn.flux()/alphacf; + phic = phiHbyASp - pEqn.flux()/alphacf; + // Explicitly relax pressure for momentum corrector p.relax(); - Uc = HbyA - + rAUc - *fvc::reconstruct((phicForces - pEqn.flux()/alphacf)/rAUcf); + Uc = + HbyA + + rAUc + *fvc::reconstruct + ( + (phicSUSu + phicSUSp*phic - pEqn.flux()/alphacf)/rASpUcf + ); Uc.correctBoundaryConditions(); fvOptions.correct(Uc); diff --git a/applications/solvers/lagrangian/particleFoam/Make/options b/applications/solvers/lagrangian/particleFoam/Make/options index 78af970334..992e22cfb5 100644 --- a/applications/solvers/lagrangian/particleFoam/Make/options +++ b/applications/solvers/lagrangian/particleFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/lnInclude \ @@ -12,8 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ diff --git a/applications/solvers/lagrangian/particleFoam/createFields.H b/applications/solvers/lagrangian/particleFoam/createFields.H index 116163ab20..f64dcca81a 100644 --- a/applications/solvers/lagrangian/particleFoam/createFields.H +++ b/applications/solvers/lagrangian/particleFoam/createFields.H @@ -57,18 +57,8 @@ volScalarField mu laminarTransport.nu()*rhoInfValue ); -word kinematicCloudName("kinematicCloud"); -args.optionReadIfPresent("cloudName", kinematicCloudName); - -Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; -basicKinematicCollidingCloud kinematicCloud -( - kinematicCloudName, - rhoInf, - U, - mu, - g -); +Info<< "Constructing clouds" << endl; +parcelCloudList clouds(rhoInf, U, mu, g); IOobject Hheader ( diff --git a/applications/solvers/lagrangian/particleFoam/particleFoam.C b/applications/solvers/lagrangian/particleFoam/particleFoam.C index 8d455d2793..e8b6c6c96f 100644 --- a/applications/solvers/lagrangian/particleFoam/particleFoam.C +++ b/applications/solvers/lagrangian/particleFoam/particleFoam.C @@ -36,19 +36,12 @@ Description #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" #include "kinematicMomentumTransportModel.H" -#include "basicKinematicCollidingCloud.H" +#include "parcelCloudList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { - argList::addOption - ( - "cloudName", - "name", - "specify alternative cloud name. default is 'kinematicCloud'" - ); - #define NO_CONTROL #include "postProcess.H" @@ -66,7 +59,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - kinematicCloud.storeGlobalPositions(); + clouds.storeGlobalPositions(); mesh.update(); @@ -76,11 +69,9 @@ int main(int argc, char *argv[]) } laminarTransport.correct(); - - Info<< "Evolving " << kinematicCloud.name() << endl; mu = laminarTransport.nu()*rhoInfValue; - kinematicCloud.evolve(); + clouds.evolve(); runTime.write(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/files b/applications/solvers/lagrangian/reactingParcelFoam/Make/files deleted file mode 100644 index 3710ca4e2d..0000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -reactingParcelFoam.C - -EXE = $(FOAM_APPBIN)/reactingParcelFoam diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H deleted file mode 100644 index 954b74e069..0000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H +++ /dev/null @@ -1,9 +0,0 @@ -Info<< "\nConstructing reacting cloud" << endl; -basicReactingMultiphaseCloud parcels -( - "reactingCloud1", - rho, - U, - g, - slgThermo -); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C deleted file mode 100644 index 69307f5314..0000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ /dev/null @@ -1,139 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - reactingParcelFoam - -Description - Transient solver for compressible, turbulent flow with a reacting, - multiphase particle cloud, and surface film modelling. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "fluidThermoMomentumTransportModel.H" -#include "rhoReactionThermophysicalTransportModel.H" -#include "basicReactingMultiphaseCloud.H" -#include "surfaceFilmModel.H" -#include "rhoReactionThermo.H" -#include "CombustionModel.H" -#include "radiationModel.H" -#include "SLGThermo.H" -#include "fvOptions.H" -#include "pimpleControl.H" -#include "pressureControl.H" -#include "localEulerDdtScheme.H" -#include "fvcSmooth.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createTimeControls.H" - #include "createFields.H" - #include "createFieldRefs.H" - #include "initContinuityErrs.H" - - turbulence->validate(); - - if (!LTS) - { - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - } - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (pimple.run(runTime)) - { - #include "readTimeControls.H" - - if (LTS) - { - #include "setRDeltaT.H" - } - else - { - #include "compressibleCourantNo.H" - #include "setMultiRegionDeltaT.H" - } - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - parcels.evolve(); - surfaceFilm.evolve(); - - if (solvePrimaryRegion) - { - if (pimple.firstPimpleIter() && !pimple.simpleRho()) - { - #include "rhoEqn.H" - } - - // --- PIMPLE loop - while (pimple.loop()) - { - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - thermophysicalTransport->correct(); - } - } - } - - rho = thermo.rho(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/files b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/files deleted file mode 100644 index 4a202fcd4d..0000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -simpleReactingParcelFoam.C - -EXE = $(FOAM_APPBIN)/simpleReactingParcelFoam diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createClouds.H deleted file mode 100644 index 954b74e069..0000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createClouds.H +++ /dev/null @@ -1,9 +0,0 @@ -Info<< "\nConstructing reacting cloud" << endl; -basicReactingMultiphaseCloud parcels -( - "reactingCloud1", - rho, - U, - g, - slgThermo -); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H similarity index 97% rename from applications/solvers/lagrangian/reactingParcelFoam/EEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/EEqn.H index 5de37eb37a..d69d145b57 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H @@ -18,7 +18,7 @@ + thermophysicalTransport->divq(he) == rho*(U&g) - + parcels.Sh(he) + + clouds.Sh(he) + surfaceFilm.Sh() + radiation->Sh(thermo, he) + combustion->Qdot() diff --git a/applications/solvers/lagrangian/reactingParticleFoam/Make/files b/applications/solvers/lagrangian/reactingParticleFoam/Make/files new file mode 100644 index 0000000000..9d992cc1fc --- /dev/null +++ b/applications/solvers/lagrangian/reactingParticleFoam/Make/files @@ -0,0 +1,3 @@ +reactingParticleFoam.C + +EXE = $(FOAM_APPBIN)/reactingParticleFoam diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/Make/options similarity index 87% rename from applications/solvers/lagrangian/reactingParcelFoam/Make/options rename to applications/solvers/lagrangian/reactingParticleFoam/Make/options index 04b9bb80f7..417e6b8353 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I. \ - -I../reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ @@ -19,16 +19,16 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(FOAM_SOLVERS)/combustion/reactingFoam + -I$(LIB_SRC)/combustionModels/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lsampling \ -lmeshTools \ + -ldynamicFvMesh \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ @@ -43,7 +43,7 @@ EXE_LIBS = \ -lsurfaceFilmModels \ -lsurfaceFilmDerivedFvPatchFields \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lODE \ -lcombustionModels diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/UEqn.H similarity index 88% rename from applications/solvers/lagrangian/coalChemistryFoam/UEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/UEqn.H index 9230617cde..6d7901fbf5 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/UEqn.H @@ -7,8 +7,7 @@ + turbulence->divDevTau(U) == rho()*g - + coalParcels.SU(U) - + limestoneParcels.SU(U) + + clouds.SU(U) + fvOptions(rho, U) ); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/YEqn.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/YEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/YEqn.H index 1f97c7236d..86c2463d7a 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/YEqn.H @@ -9,7 +9,6 @@ tmp> mvConvection ) ); - { combustion->correct(); volScalarField Yt(0.0*Y[0]); @@ -26,7 +25,7 @@ tmp> mvConvection + mvConvection->fvmDiv(phi, Yi) + thermophysicalTransport->divj(Yi) == - parcels.SYi(i, Yi) + clouds.SYi(i, Yi) + fvOptions(rho, Yi) + combustion->R(Yi) + surfaceFilm.Srho(i) diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files new file mode 100644 index 0000000000..317e887d97 --- /dev/null +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files @@ -0,0 +1,3 @@ +buoyantReactingParticleFoam.C + +EXE = $(FOAM_APPBIN)/buoyantReactingParticleFoam diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options similarity index 78% rename from applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options rename to applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options index 7955e92863..b455411139 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options @@ -1,17 +1,14 @@ EXE_INC = \ -I. \ -I.. \ - -I../../reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/spray/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -20,35 +17,34 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ + -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude - EXE_LIBS = \ -lfiniteVolume \ - -lmeshTools \ + -lfvOptions \ -lsampling \ + -lmeshTools \ + -ldynamicFvMesh \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ - -lpsiReactionThermophysicalTransportModels \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -llagrangianSpray \ + -lrhoReactionThermophysicalTransportModels \ -lspecie \ -lfluidThermophysicalModels \ - -lthermophysicalProperties \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiationModels \ - -lODE \ - -lengine \ -lregionModels \ + -lradiationModels \ -lsurfaceFilmModels \ - -lfvOptions \ + -lsurfaceFilmDerivedFvPatchFields \ + -llagrangian \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ + -lODE \ -lcombustionModels diff --git a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/UEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H index f6a9d58ef9..9701aa1dc4 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H @@ -6,7 +6,7 @@ + MRF.DDt(rho, U) + turbulence->divDevTau(U) == - parcels.SU(U) + clouds.SU(U) + fvOptions(rho, U) ); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C similarity index 58% rename from applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C rename to applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C index 652dda5124..b79289ebfc 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C @@ -22,26 +22,27 @@ License along with OpenFOAM. If not, see . Application - coalChemistryFoam + buoyantReactingParticleFoam Description - Transient solver for compressible, turbulent flow, with coal and limestone - particle clouds, an energy source, and combustion. + Transient solver for buoyant, compressible, turbulent flow with a particle + cloud and surface film modelling. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "dynamicFvMesh.H" #include "fluidThermoMomentumTransportModel.H" -#include "psiReactionThermophysicalTransportModel.H" -#include "basicThermoCloud.H" -#include "coalCloud.H" -#include "psiReactionThermo.H" +#include "rhoReactionThermophysicalTransportModel.H" +#include "parcelCloudList.H" +#include "surfaceFilmModel.H" #include "CombustionModel.H" -#include "fvOptions.H" #include "radiationModel.H" #include "SLGThermo.H" +#include "fvOptions.H" #include "pimpleControl.H" #include "pressureControl.H" +#include "CorrectPhi.H" #include "localEulerDdtScheme.H" #include "fvcSmooth.H" @@ -53,12 +54,12 @@ int main(int argc, char *argv[]) #include "setRootCaseLists.H" #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createTimeControls.H" + #include "createDynamicFvMesh.H" + #include "createDyMControls.H" + #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" - #include "initContinuityErrs.H" + #include "createRhoUfIfPresent.H" turbulence->validate(); @@ -74,7 +75,20 @@ int main(int argc, char *argv[]) while (pimple.run(runTime)) { - #include "readTimeControls.H" + #include "readDyMControls.H" + + // Store divrhoU from the previous mesh so that it can be mapped + // and used in correctPhi to ensure the corrected phi has the + // same divergence + autoPtr divrhoU; + if (solvePrimaryRegion && correctPhi) + { + divrhoU = new volScalarField + ( + "divrhoU", + fvc::div(fvc::absolute(phi, rho, U)) + ); + } if (LTS) { @@ -83,24 +97,62 @@ int main(int argc, char *argv[]) else { #include "compressibleCourantNo.H" - #include "setDeltaT.H" + #include "setMultiRegionDeltaT.H" } runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - rhoEffLagrangian = coalParcels.rhoEff() + limestoneParcels.rhoEff(); - pDyn = 0.5*rho*magSqr(U); + // Store momentum to set rhoUf for introduced faces. + autoPtr rhoU; + if (solvePrimaryRegion && rhoUf.valid()) + { + rhoU = new volVectorField("rhoU", rho*U); + } - coalParcels.evolve(); + // Store the particle positions + clouds.storeGlobalPositions(); - limestoneParcels.evolve(); + // Do any mesh changes + mesh.update(); - #include "rhoEqn.H" + if (solvePrimaryRegion && mesh.changing()) + { + gh = (g & mesh.C()) - ghRef; + ghf = (g & mesh.Cf()) - ghRef; - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) + + MRF.update(); + + if (correctPhi) + { + // Calculate absolute flux + // from the mapped surface velocity + phi = mesh.Sf() & rhoUf(); + + #include "../../compressible/rhoPimpleFoam/correctPhi.H" + + // Make the fluxes relative to the mesh-motion + fvc::makeRelative(phi, rho, U); + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + + clouds.evolve(); + surfaceFilm.evolve(); + + if (solvePrimaryRegion && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } + + // --- PIMPLE loop + while (solvePrimaryRegion && pimple.loop()) { #include "UEqn.H" #include "YEqn.H" @@ -128,7 +180,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info<< "End\n" << endl; + Info<< "End" << endl; return 0; } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/createFields.H rename to applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H index f406c50700..e14202b476 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H @@ -94,12 +94,10 @@ volScalarField dpdt Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); - #include "readGravitationalAcceleration.H" #include "readhRef.H" #include "gh.H" - volScalarField p_rgh ( IOobject @@ -116,7 +114,14 @@ volScalarField p_rgh // Force p_rgh to be consistent with p p_rgh = p - rho*gh; -pressureControl pressureControl(p, rho, pimple.dict(), false); +pressureControl pressureControl +( + p, + p_rgh, + rho, + pimple.dict(), + thermo.incompressible() +); mesh.setFluxRequired(p_rgh.name()); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H similarity index 90% rename from applications/solvers/lagrangian/reactingParcelFoam/pEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H index d798132f1f..e4a55c95ab 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H @@ -33,7 +33,7 @@ fvScalarMatrix p_rghDDtEqn fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh)) + fvc::div(phiHbyA) == - parcels.Srho() + clouds.Srho() + surfaceFilm.Srho() + fvOptions(psi, p_rgh, rho.name()) ); @@ -87,7 +87,15 @@ if (pimple.simpleRho()) rho = thermo.rho(); } +// Correct rhoUf if the mesh is moving +fvc::correctRhoUf(rhoUf, rho, U, phi); + if (thermo.dpdt()) { dpdt = fvc::ddt(p); + + if (mesh.moving()) + { + dpdt -= fvc::div(fvc::meshPhi(rho, U), p); + } } diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H b/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H new file mode 100644 index 0000000000..afdbf46543 --- /dev/null +++ b/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H @@ -0,0 +1,2 @@ +Info<< "\nConstructing clouds" << endl; +parcelCloudList clouds(rho, U, g, slgThermo); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParticleFoam/createFieldRefs.H similarity index 100% rename from applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H rename to applications/solvers/lagrangian/reactingParticleFoam/createFieldRefs.H diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/createFields.H similarity index 72% rename from applications/solvers/lagrangian/sprayFoam/createFields.H rename to applications/solvers/lagrangian/reactingParticleFoam/createFields.H index 1c7a456ded..0b47c7a365 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/createFields.H @@ -1,8 +1,8 @@ -#include "readGravitationalAcceleration.H" +#include "createRDeltaT.H" Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(psiReactionThermo::New(mesh)); -psiReactionThermo& thermo = pThermo(); +autoPtr pThermo(rhoReactionThermo::New(mesh)); +rhoReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); SLGThermo slgThermo(mesh, thermo); @@ -19,21 +19,20 @@ if (!composition.species().found(inertSpecie)) << exit(FatalIOError); } -volScalarField& p = thermo.p(); - +Info<< "Creating field rho\n" << endl; volScalarField rho ( IOobject ( "rho", runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE + mesh ), thermo.rho() ); +volScalarField& p = thermo.p(); + Info<< "\nReading field U\n" << endl; volVectorField U ( @@ -50,30 +49,6 @@ volVectorField U #include "compressibleCreatePhi.H" -mesh.setFluxRequired(p.name()); - -dimensionedScalar rhoMax -( - dimensionedScalar::lookupOrDefault - ( - "rhoMax", - pimple.dict(), - dimDensity, - great - ) -); - -dimensionedScalar rhoMin -( - dimensionedScalar::lookupOrDefault - ( - "rhoMin", - pimple.dict(), - dimDensity, - 0 - ) -); - Info<< "Creating turbulence model\n" << endl; autoPtr turbulence ( @@ -87,15 +62,20 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr +thermophysicalTransport ( - psiReactionThermophysicalTransportModel::New(turbulence(), thermo) + rhoReactionThermophysicalTransportModel::New + ( + turbulence(), + thermo + ) ); Info<< "Creating combustion model\n" << endl; -autoPtr> combustion +autoPtr> combustion ( - CombustionModel::New(thermo, turbulence()) + CombustionModel::New(thermo, turbulence()) ); Info<< "Creating field dpdt\n" << endl; @@ -113,6 +93,19 @@ volScalarField dpdt Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); + +#include "readGravitationalAcceleration.H" + +pressureControl pressureControl +( + p, + rho, + pimple.dict(), + thermo.incompressible() +); + +mesh.setFluxRequired(p.name()); + multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i) @@ -122,6 +115,7 @@ forAll(Y, i) fields.add(thermo.he()); #include "createMRF.H" -#include "createClouds.H" #include "createRadiationModel.H" +#include "createClouds.H" +#include "createSurfaceFilmModel.H" #include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createSurfaceFilmModel.H b/applications/solvers/lagrangian/reactingParticleFoam/createSurfaceFilmModel.H similarity index 100% rename from applications/solvers/lagrangian/reactingParcelFoam/createSurfaceFilmModel.H rename to applications/solvers/lagrangian/reactingParticleFoam/createSurfaceFilmModel.H diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/files b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/files similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/engineFoam/Make/files rename to applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/files diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options similarity index 76% rename from applications/solvers/lagrangian/sprayFoam/Make/options rename to applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options index 0459d9c2b5..f72db3fc08 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options @@ -1,17 +1,14 @@ EXE_INC = \ -I. \ - -I../reactingParcelFoam \ - -I../../compressible/rhoPimpleFoam \ + -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/psiReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/spray/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -20,36 +17,36 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ + -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/engine/lnInclude EXE_LIBS = \ + -lfiniteVolume \ + -lfvOptions \ + -lsampling \ + -lmeshTools \ + -ldynamicFvMesh \ -lmomentumTransportModels \ -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ - -lpsiReactionThermophysicalTransportModels \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -llagrangianSpray \ + -lrhoReactionThermophysicalTransportModels \ -lspecie \ -lfluidThermophysicalModels \ - -lthermophysicalProperties \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiationModels \ - -lODE \ -lregionModels \ + -lradiationModels \ -lsurfaceFilmModels \ + -lsurfaceFilmDerivedFvPatchFields \ + -llagrangian \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ + -lODE \ -lcombustionModels \ - -lfiniteVolume \ - -ldynamicFvMesh \ - -ltopoChangerFvMesh \ - -lfvOptions \ - -lmeshTools \ - -lsampling + -lengine diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C similarity index 59% rename from applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C rename to applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C index d58c9740ef..e74b12fcc0 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C @@ -31,17 +31,20 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "engineTime.H" #include "engineMesh.H" #include "fluidThermoMomentumTransportModel.H" -#include "psiReactionThermophysicalTransportModel.H" -#include "basicSprayCloud.H" -#include "psiReactionThermo.H" +#include "rhoReactionThermophysicalTransportModel.H" +#include "parcelCloudList.H" +#include "surfaceFilmModel.H" #include "CombustionModel.H" #include "radiationModel.H" #include "SLGThermo.H" -#include "pimpleControl.H" #include "fvOptions.H" +#include "pimpleControl.H" +#include "pressureControl.H" +#include "CorrectPhi.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,40 +57,101 @@ int main(int argc, char *argv[]) #include "setRootCaseLists.H" #include "createEngineTime.H" #include "createEngineMesh.H" - #include "createControl.H" - #include "readEngineTimeControls.H" + #include "createEngineControls.H" + #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - #include "initContinuityErrs.H" #include "createRhoUfIfPresent.H" #include "startSummary.H" turbulence->validate(); + if (!LTS) + { + #include "compressibleCourantNo.H" + #include "setInitialDeltaT.H" + } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; while (pimple.run(runTime)) { - #include "readEngineTimeControls.H" - #include "compressibleCourantNo.H" - #include "setDeltaT.H" + #include "readEngineControls.H" + + // Store divrhoU from the previous mesh so that it can be mapped + // and used in correctPhi to ensure the corrected phi has the + // same divergence + autoPtr divrhoU; + if (solvePrimaryRegion && correctPhi) + { + divrhoU = new volScalarField + ( + "divrhoU", + fvc::div(fvc::absolute(phi, rho, U)) + ); + } + + if (LTS) + { + #include "setRDeltaT.H" + } + else + { + #include "compressibleCourantNo.H" + #include "setMultiRegionDeltaT.H" + } runTime++; Info<< "Engine time = " << runTime.theta() << runTime.unit() << endl; + // Store momentum to set rhoUf for introduced faces. + autoPtr rhoU; + if (solvePrimaryRegion && rhoUf.valid()) + { + rhoU = new volVectorField("rhoU", rho*U); + } + + // Store the particle positions + clouds.storeGlobalPositions(); + + // Do any mesh changes mesh.move(); - parcels.evolve(); + if (solvePrimaryRegion && mesh.changing()) + { + MRF.update(); - #include "rhoEqn.H" + if (correctPhi) + { + // Calculate absolute flux + // from the mapped surface velocity + phi = mesh.Sf() & rhoUf(); - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) + #include "../../compressible/rhoPimpleFoam/correctPhi.H" + + // Make the fluxes relative to the mesh-motion + fvc::makeRelative(phi, rho, U); + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + + clouds.evolve(); + surfaceFilm.evolve(); + + if (solvePrimaryRegion && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } + + // --- PIMPLE loop + while (solvePrimaryRegion && pimple.loop()) { #include "UEqn.H" #include "YEqn.H" @@ -117,7 +181,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info<< "End\n" << endl; + Info<< "End" << endl; return 0; } diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/logSummary.H b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/logSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/engineFoam/logSummary.H rename to applications/solvers/lagrangian/reactingParticleFoam/engineFoam/logSummary.H diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/startSummary.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H rename to applications/solvers/lagrangian/reactingParticleFoam/engineFoam/startSummary.H diff --git a/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H new file mode 100644 index 0000000000..f30bea2576 --- /dev/null +++ b/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H @@ -0,0 +1,90 @@ +if (!pimple.simpleRho()) +{ + rho = thermo.rho(); +} + +// Thermodynamic density needs to be updated by psi*d(p) after the +// pressure solution +const volScalarField psip0(psi*p); + +volScalarField rAU(1.0/UEqn.A()); +surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); +volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); +surfaceScalarField phiHbyA +( + "phiHbyA", + ( + fvc::interpolate(rho)*fvc::flux(HbyA) + + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf)) + ) +); + +fvc::makeRelative(phiHbyA, rho, U); +MRF.makeRelative(fvc::interpolate(rho), phiHbyA); + +// Update the pressure BCs to ensure flux consistency +constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); + +fvScalarMatrix pDDtEqn +( + fvc::ddt(rho) + psi*correction(fvm::ddt(p)) + + fvc::div(phiHbyA) + == + clouds.Srho() + + surfaceFilm.Srho() + + fvOptions(psi, p, rho.name()) +); + +while (pimple.correctNonOrthogonal()) +{ + fvScalarMatrix pEqn + ( + pDDtEqn + - fvm::laplacian(rhorAUf, p) + ); + + pEqn.solve(); + + if (pimple.finalNonOrthogonalIter()) + { + phi = phiHbyA + pEqn.flux(); + } +} + +p.relax(); + +U = HbyA - rAU*fvc::grad(p); +U.correctBoundaryConditions(); +fvOptions.correct(U); +K = 0.5*magSqr(U); + +bool limitedp = pressureControl.limit(p); + +// Thermodynamic density update +thermo.correctRho(psi*p - psip0); + +if (limitedp) +{ + rho = thermo.rho(); +} + +#include "rhoEqn.H" +#include "compressibleContinuityErrs.H" + +if (pimple.simpleRho()) +{ + rho = thermo.rho(); +} + +// Correct rhoUf if the mesh is moving +fvc::correctRhoUf(rhoUf, rho, U, phi); + +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); + + if (mesh.moving()) + { + dpdt -= fvc::div(fvc::meshPhi(rho, U), p); + } +} diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C similarity index 75% rename from applications/solvers/lagrangian/sprayFoam/sprayFoam.C rename to applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C index 95d48bf813..1d60b82640 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C @@ -22,27 +22,29 @@ License along with OpenFOAM. If not, see . Application - sprayFoam + reactingParticleFoam Description - Transient solver for compressible, turbulent flow with a spray particle - cloud, with optional mesh motion and mesh topology changes. + Transient solver for compressible, turbulent flow with a particle cloud + and surface film modelling. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" #include "dynamicFvMesh.H" -#include "momentumTransportModel.H" -#include "fluidThermophysicalTransportModel.H" -#include "psiReactionThermophysicalTransportModel.H" -#include "basicSprayCloud.H" -#include "psiReactionThermo.H" +#include "fluidThermoMomentumTransportModel.H" +#include "rhoReactionThermophysicalTransportModel.H" +#include "parcelCloudList.H" +#include "surfaceFilmModel.H" #include "CombustionModel.H" #include "radiationModel.H" #include "SLGThermo.H" -#include "pimpleControl.H" -#include "CorrectPhi.H" #include "fvOptions.H" +#include "pimpleControl.H" +#include "pressureControl.H" +#include "CorrectPhi.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,15 +56,19 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createDynamicFvMesh.H" #include "createDyMControls.H" + #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - #include "initContinuityErrs.H" #include "createRhoUfIfPresent.H" turbulence->validate(); + if (!LTS) + { + #include "compressibleCourantNo.H" + #include "setInitialDeltaT.H" + } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -75,7 +81,7 @@ int main(int argc, char *argv[]) // and used in correctPhi to ensure the corrected phi has the // same divergence autoPtr divrhoU; - if (correctPhi) + if (solvePrimaryRegion && correctPhi) { divrhoU = new volScalarField ( @@ -84,8 +90,15 @@ int main(int argc, char *argv[]) ); } - #include "compressibleCourantNo.H" - #include "setDeltaT.H" + if (LTS) + { + #include "setRDeltaT.H" + } + else + { + #include "compressibleCourantNo.H" + #include "setMultiRegionDeltaT.H" + } runTime++; @@ -93,27 +106,28 @@ int main(int argc, char *argv[]) // Store momentum to set rhoUf for introduced faces. autoPtr rhoU; - if (rhoUf.valid()) + if (solvePrimaryRegion && rhoUf.valid()) { rhoU = new volVectorField("rhoU", rho*U); } // Store the particle positions - parcels.storeGlobalPositions(); + clouds.storeGlobalPositions(); // Do any mesh changes mesh.update(); - if (mesh.changing()) + if (solvePrimaryRegion && mesh.changing()) { MRF.update(); if (correctPhi) { - // Calculate absolute flux from the mapped surface velocity + // Calculate absolute flux + // from the mapped surface velocity phi = mesh.Sf() & rhoUf(); - #include "correctPhi.H" + #include "../../compressible/rhoPimpleFoam/correctPhi.H" // Make the fluxes relative to the mesh-motion fvc::makeRelative(phi, rho, U); @@ -125,12 +139,16 @@ int main(int argc, char *argv[]) } } - parcels.evolve(); + clouds.evolve(); + surfaceFilm.evolve(); - #include "rhoEqn.H" + if (solvePrimaryRegion && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) + // --- PIMPLE loop + while (solvePrimaryRegion && pimple.loop()) { #include "UEqn.H" #include "YEqn.H" @@ -158,7 +176,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info<< "End\n" << endl; + Info<< "End" << endl; return 0; } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H similarity index 94% rename from applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H rename to applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H index f51ab88cde..4805dbed8f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description fvm::ddt(rho) + fvc::div(phi) == - parcels.Srho(rho) + clouds.Srho(rho) + surfaceFilm.Srho() + fvOptions(rho) ); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H b/applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H rename to applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H index dc42e70770..5c7e38848d 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H similarity index 98% rename from applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H rename to applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H index a7dce60cf2..9c8c8dd2a7 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H @@ -78,7 +78,7 @@ License ( mag ( - parcels.hsTrans()/(mesh.V()*runTime.deltaT()) + clouds.hsTrans()/(mesh.V()*runTime.deltaT()) + combustion->Qdot()() ) /( diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options index ca7fbfcb72..46144ebabf 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/Make/options +++ b/applications/solvers/lagrangian/rhoParticleFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -15,8 +15,8 @@ EXE_INC = \ EXE_LIBS = \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H index a3215faf6d..39e091c9b3 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/createFields.H +++ b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H @@ -49,17 +49,5 @@ autoPtr turbulence ) ); -const word kinematicCloudName -( - args.optionLookupOrDefault("cloudName", "kinematicCloud") -); - -Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; -basicKinematicCloud kinematicCloud -( - kinematicCloudName, - rho, - U, - thermo.mu(), - g -); +Info<< "Constructing clouds" << endl; +parcelCloudList clouds(rho, U, thermo.mu(), g); diff --git a/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C index 738916add4..5863d280f9 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C +++ b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C @@ -35,19 +35,12 @@ Description #include "dynamicFvMesh.H" #include "psiThermo.H" #include "fluidThermoMomentumTransportModel.H" -#include "basicKinematicCloud.H" +#include "parcelCloudList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { - argList::addOption - ( - "cloudName", - "name", - "specify alternative cloud name. default is 'kinematicCloud'" - ); - #define NO_CONTROL #include "postProcess.H" @@ -65,7 +58,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - kinematicCloud.storeGlobalPositions(); + clouds.storeGlobalPositions(); mesh.update(); @@ -74,8 +67,7 @@ int main(int argc, char *argv[]) U.correctBoundaryConditions(); } - Info<< "Evolving " << kinematicCloud.name() << endl; - kinematicCloud.evolve(); + clouds.evolve(); runTime.write(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H index 4507b5817c..31d4828a45 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H @@ -12,7 +12,7 @@ + thermophysicalTransport->divq(he) == rho*(U&g) - + parcels.Sh(he) + + clouds.Sh(he) + radiation->Sh(thermo, he) + combustion->Qdot() + fvOptions(rho, he) diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files new file mode 100644 index 0000000000..8d061ab3d0 --- /dev/null +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files @@ -0,0 +1,3 @@ +simpleReactingParticleFoam.C + +EXE = $(FOAM_APPBIN)/simpleReactingParticleFoam diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options similarity index 86% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options rename to applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options index 1dde5a705b..d8f8d49b5b 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options @@ -7,8 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/rhoReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -21,8 +20,7 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(FOAM_SOLVERS)/combustion/reactingFoam + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ @@ -33,8 +31,8 @@ EXE_LIBS = \ -lthermophysicalTransportModels \ -lrhoReactionThermophysicalTransportModels \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lspecie \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H similarity index 94% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H index 15257112f9..467692cd3f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H @@ -7,7 +7,7 @@ + turbulence->divDevTau(U) == rho()*g - + parcels.SU(U) + + clouds.SU(U) + fvOptions(rho, U) ); fvVectorMatrix& UEqn = tUEqn.ref(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H index 35b68bcc07..df6fb70471 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H @@ -24,7 +24,7 @@ tmp> mvConvection mvConvection->fvmDiv(phi, Yi) + thermophysicalTransport->divj(Yi) == - parcels.SYi(i, Yi) + clouds.SYi(i, Yi) + combustion->R(Yi) + fvOptions(rho, Yi) ); diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H new file mode 100644 index 0000000000..afdbf46543 --- /dev/null +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H @@ -0,0 +1,2 @@ +Info<< "\nConstructing clouds" << endl; +parcelCloudList clouds(rho, U, g, slgThermo); diff --git a/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H similarity index 100% rename from applications/solvers/lagrangian/sprayFoam/createFieldRefs.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H index e7f76d8456..fdc479bc23 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFieldRefs.H +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H @@ -1,3 +1,3 @@ -const volScalarField& T = thermo.T(); const volScalarField& psi = thermo.psi(); +const volScalarField& T = thermo.T(); const label inertIndex(composition.species()[inertSpecie]); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H similarity index 100% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H similarity index 98% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H rename to applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H index 1ce5db0ec8..e434a84acd 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H @@ -24,7 +24,7 @@ while (simple.correctNonOrthogonal()) fvc::div(phiHbyA) - fvm::laplacian(rhorAUf, p) == - parcels.Srho() + clouds.Srho() + fvOptions(psi, p, rho.name()) ); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C similarity index 96% rename from applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C rename to applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C index 3c9631a652..0b0388afcc 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - simpleReactingParcelFoam + simpleReactingParticleFoam Description Steady state solver for compressible, turbulent flow with reacting, @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "fluidThermoMomentumTransportModel.H" #include "rhoReactionThermophysicalTransportModel.H" -#include "basicReactingMultiphaseCloud.H" +#include "parcelCloudList.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" #include "radiationModel.H" @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - parcels.evolve(); + clouds.evolve(); // --- Pressure-velocity SIMPLE corrector loop { diff --git a/applications/solvers/lagrangian/sprayFoam/EEqn.H b/applications/solvers/lagrangian/sprayFoam/EEqn.H deleted file mode 100644 index 7baab51647..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/EEqn.H +++ /dev/null @@ -1,40 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - fvm::ddt(rho, he) + mvConvection->fvmDiv(phi, he) - + fvc::ddt(rho, K) + fvc::div(phi, K) - + ( - he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) - : -dpdt - ) - + thermophysicalTransport->divq(he) - == - rho*(U&g) - + parcels.Sh(he) - + radiation->Sh(thermo, he) - + combustion->Qdot() - + fvOptions(rho, he) - ); - - EEqn.relax(); - - fvOptions.constrain(EEqn); - - EEqn.solve(); - - fvOptions.correct(he); - - thermo.correct(); - radiation->correct(); - - Info<< "T gas min/max " << min(T).value() << ", " - << max(T).value() << endl; -} diff --git a/applications/solvers/lagrangian/sprayFoam/Make/files b/applications/solvers/lagrangian/sprayFoam/Make/files deleted file mode 100644 index 893038ce0a..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -sprayFoam.C - -EXE = $(FOAM_APPBIN)/sprayFoam diff --git a/applications/solvers/lagrangian/sprayFoam/UEqn.H b/applications/solvers/lagrangian/sprayFoam/UEqn.H deleted file mode 100644 index cf97416e0b..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/UEqn.H +++ /dev/null @@ -1,27 +0,0 @@ -// Solve the Momentum equation - -MRF.correctBoundaryVelocity(U); - -tmp tUEqn -( - fvm::ddt(rho, U) + fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) - == - rho()*g - + parcels.SU(U) - + fvOptions(rho, U) -); -fvVectorMatrix& UEqn = tUEqn.ref(); - -UEqn.relax(); - -fvOptions.constrain(UEqn); - -if (pimple.momentumPredictor()) -{ - solve(UEqn == -fvc::grad(p)); - - fvOptions.correct(U); - K = 0.5*magSqr(U); -} diff --git a/applications/solvers/lagrangian/sprayFoam/YEqn.H b/applications/solvers/lagrangian/sprayFoam/YEqn.H deleted file mode 100644 index b365b0bc4a..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/YEqn.H +++ /dev/null @@ -1,48 +0,0 @@ -tmp> mvConvection -( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) -); - -{ - combustion->correct(); - volScalarField Yt(0.0*Y[0]); - - forAll(Y, i) - { - if (i != inertIndex && composition.active(i)) - { - volScalarField& Yi = Y[i]; - - fvScalarMatrix YEqn - ( - fvm::ddt(rho, Yi) - + mvConvection->fvmDiv(phi, Yi) - + thermophysicalTransport->divj(Yi) - == - parcels.SYi(i, Yi) - + combustion->R(Yi) - + fvOptions(rho, Yi) - ); - - YEqn.relax(); - - fvOptions.constrain(YEqn); - - YEqn.solve("Yi"); - - fvOptions.correct(Yi); - - Yi.max(0.0); - Yt += Yi; - } - } - - Y[inertIndex] = scalar(1) - Yt; - Y[inertIndex].max(0.0); -} diff --git a/applications/solvers/lagrangian/sprayFoam/createClouds.H b/applications/solvers/lagrangian/sprayFoam/createClouds.H deleted file mode 100644 index ee0985ff70..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/createClouds.H +++ /dev/null @@ -1,9 +0,0 @@ -Info<< "\nConstructing reacting cloud" << endl; -basicSprayCloud parcels -( - "sprayCloud", - rho, - U, - g, - slgThermo -); diff --git a/applications/solvers/lagrangian/sprayFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/pEqn.H deleted file mode 100644 index 131a881486..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/pEqn.H +++ /dev/null @@ -1,119 +0,0 @@ -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); - -volScalarField rAU(1.0/UEqn.A()); -surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); - -if (pimple.nCorrPiso() <= 1) -{ - tUEqn.clear(); -} - -if (pimple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi) - *( - fvc::flux(HbyA) - + MRF.zeroFilter - ( - rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf)/fvc::interpolate(rho) - ) - ) - ); - - fvc::makeRelative(phid, psi, U); - MRF.makeRelative(fvc::interpolate(psi), phid); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvm::div(phid, p) - - fvm::laplacian(rhorAUf, p) - == - parcels.Srho() - + fvOptions(psi, p, rho.name()) - ); - - pEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi == pEqn.flux(); - } - } -} -else -{ - surfaceScalarField phiHbyA - ( - "phiHbyA", - fvc::interpolate(rho)*fvc::flux(HbyA) - + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf)) - ); - - fvc::makeRelative(phiHbyA, rho, U); - MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - - // Update the pressure BCs to ensure flux consistency - constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvc::div(phiHbyA) - - fvm::laplacian(rhorAUf, p) - == - parcels.Srho() - + fvOptions(psi, p, rho.name()) - ); - - pEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA + pEqn.flux(); - } - } -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -// Recalculate density from the relaxed pressure -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); -Info<< "rho max/min : " << max(rho).value() - << " " << min(rho).value() << endl; - -U = HbyA - rAU*fvc::grad(p); -U.correctBoundaryConditions(); -fvOptions.correct(U); -K = 0.5*magSqr(U); - -// Correct rhoUf if the mesh is moving -fvc::correctRhoUf(rhoUf, rho, U, phi); - -if (thermo.dpdt()) -{ - dpdt = fvc::ddt(p); - - if (mesh.moving()) - { - dpdt -= fvc::div(fvc::meshPhi(rho, U), p); - } -} diff --git a/applications/solvers/lagrangian/sprayFoam/rhoEqn.H b/applications/solvers/lagrangian/sprayFoam/rhoEqn.H deleted file mode 100644 index e8c2e12473..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/rhoEqn.H +++ /dev/null @@ -1,47 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Global - rhoEqn - -Description - Solve the continuity for density. - -\*---------------------------------------------------------------------------*/ - -{ - fvScalarMatrix rhoEqn - ( - fvm::ddt(rho) - + fvc::div(phi) - == - parcels.Srho(rho) - + fvOptions(rho) - ); - - rhoEqn.solve(); - - fvOptions.correct(rho); -} - -// ************************************************************************* // diff --git a/applications/test/Function1/Make/options b/applications/test/Function1/Make/options index 5854e1004e..e69de29bb2 100644 --- a/applications/test/Function1/Make/options +++ b/applications/test/Function1/Make/options @@ -1,14 +0,0 @@ -EXE_INC = \ - -DFULLDEBUG -g -O0 \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = \ - -llagrangianIntermediate \ - -lradiationModels \ - -lregionModels \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling diff --git a/bin/DPMFoam b/bin/DPMFoam new file mode 100755 index 0000000000..9a7d32a55b --- /dev/null +++ b/bin/DPMFoam @@ -0,0 +1,58 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# DPMFoam +# +# Description +# Script to inform the user that DPMFoam has been replaced by the more +# general denseParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The DPMFoam solver has solver has been replaced by the more general +denseParticleFoam solver, which supports incompressible flow, including the +effect of the volume fraction of particles on the continuous phase, coupled to +multiple run-time-selectable lagrangian clouds. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from DPMFoam: + + \$FOAM_TUTORIALS/lagrangian/denseParticleFoam/Goldschmidt + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/MPPICFoam b/bin/MPPICFoam new file mode 100755 index 0000000000..90938c4ee4 --- /dev/null +++ b/bin/MPPICFoam @@ -0,0 +1,58 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# MPPICFoam +# +# Description +# Script to inform the user that MPPICFoam has been replaced by the more +# general denseParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The MPPICFoam solver has solver has been replaced by the more general +denseParticleFoam solver, which supports incompressible flow, including the +effect of the volume fraction of particles on the continuous phase, coupled to +multiple run-time-selectable lagrangian clouds. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from MPPICFoam: + + \$FOAM_TUTORIALS/lagrangian/denseParticleFoam/GoldschmidtMPPIC + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/coalChemistryFoam b/bin/coalChemistryFoam new file mode 100755 index 0000000000..460b681eb7 --- /dev/null +++ b/bin/coalChemistryFoam @@ -0,0 +1,57 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# coalChemistryFoam +# +# Description +# Script to inform the user that coalChemistryFoam has been replaced by the +# more general reactingParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The coalChemistryFoam solver has solver has been replaced by the more general +reactingParticleFoam solver, which supports compressible reacting flow coupled +to multiple run-time-selectable lagrangian clouds and surface film modelling. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from coalChemistryFoam: + + \$FOAM_TUTORIALS/lagrangian/reactingParticleFoam/simplifiedSiwek + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/reactingParcelFoam b/bin/reactingParcelFoam new file mode 100755 index 0000000000..fcce87f974 --- /dev/null +++ b/bin/reactingParcelFoam @@ -0,0 +1,58 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# reactingParcelFoam +# +# Description +# Script to inform the user that reactingParcelFoam has been replaced by the +# more general buoyantReactingParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The reactingParcelFoam solver has solver has been replaced by the more general +buoyantReactingParticleFoam solver, which supports buoyant compressible +reacting flow coupled to multiple run-time-selectable lagrangian clouds and +surface film modelling. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from reactingParcelFoam: + + \$FOAM_TUTORIALS/lagrangian/buoyantReactingParticleFoam/splashPanel + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/simpleReactingParcelFoam b/bin/simpleReactingParcelFoam new file mode 100755 index 0000000000..2d38b4b091 --- /dev/null +++ b/bin/simpleReactingParcelFoam @@ -0,0 +1,58 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# simpleReactingParcelFoam +# +# Description +# Script to inform the user that simpleReactingParcelFoam has been replaced +# by the more general simpleReactingParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The simpleReactingParcelFoam solver has solver has been replaced by the more +general simpleReactingParticleFoam solver, which supports buoyant compressible +reacting flow coupled to multiple run-time-selectable lagrangian clouds and +surface film modelling. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from simpleReactingParcelFoam: + + \$FOAM_TUTORIALS/lagrangian/simpleReactingParticleFoam/verticalChannel + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/sprayFoam b/bin/sprayFoam new file mode 100755 index 0000000000..62971bb377 --- /dev/null +++ b/bin/sprayFoam @@ -0,0 +1,57 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# sprayFoam +# +# Description +# Script to inform the user that sprayFoam has been replaced by the +# more general reactingParticleFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The sprayFoam solver has solver has been replaced by the more general +reactingParticleFoam solver, which supports compressible reacting flow coupled +to multiple run-time-selectable lagrangian clouds and surface film modelling. + +To run with a single cloud rename the constant/*CloudProperties file to +constant/cloudProperties. + +To run with a multiple clouds create a constant/clouds file with a list of the +names of clouds in it. Each cloud then has a corresponding +constant/Properties file. + +In addition, cloud properties files also now require a "type" entry to specify +the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, +collidingCloud, etc ...). + +See the following case for an example converted from sprayFoam: + + \$FOAM_TUTORIALS/lagrangian/reactingParticleFoam/aachenBomb + +EOF + +#------------------------------------------------------------------------------ diff --git a/etc/caseDicts/postProcessing/solvers/particles/particles b/etc/caseDicts/postProcessing/solvers/particles/particles index b4e9be99a8..372d9757d7 100644 --- a/etc/caseDicts/postProcessing/solvers/particles/particles +++ b/etc/caseDicts/postProcessing/solvers/particles/particles @@ -8,9 +8,8 @@ Description Tracks a cloud of particles driven by the flow of the continuous phase. - The cloud is specified by a kinematicCloudProperties file in the constant - directory. A template file is provided in: - $FOAM_ETC/caseDicts/solvers/lagrangian + The cloud is specified by a cloudProperties file in the constant directory. + A template file is provided in: $FOAM_ETC/caseDicts/solvers/lagrangian \*---------------------------------------------------------------------------*/ diff --git a/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties b/etc/caseDicts/solvers/lagrangian/cloudProperties similarity index 98% rename from etc/caseDicts/solvers/lagrangian/kinematicCloudProperties rename to etc/caseDicts/solvers/lagrangian/cloudProperties index 995b813d5e..17e9b46c62 100644 --- a/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties +++ b/etc/caseDicts/solvers/lagrangian/cloudProperties @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object kinematicCloudProperties; + object cloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/include/macros.H b/src/OpenFOAM/include/macros.H index 56bcafd3f8..29db28534d 100644 --- a/src/OpenFOAM/include/macros.H +++ b/src/OpenFOAM/include/macros.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,6 +53,10 @@ Description //- Map 'name' to 'Name' via the predefined macro CAPITALIZE_name #define CAPITALIZE(name) CAPITALIZE_##name +//- Convert macro expression to a string +#define STR_(x) #x +#define STR(x) STR_(x) + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #endif diff --git a/src/engine/include/createEngineControls.H b/src/engine/include/createEngineControls.H new file mode 100644 index 0000000000..5a57cfa6c7 --- /dev/null +++ b/src/engine/include/createEngineControls.H @@ -0,0 +1,3 @@ +#include "createDyMControls.H" + +maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/src/engine/include/createEngineTimeControls.H b/src/engine/include/createEngineTimeControls.H new file mode 100644 index 0000000000..cb4f8e891c --- /dev/null +++ b/src/engine/include/createEngineTimeControls.H @@ -0,0 +1,3 @@ +#include "createTimeControls.H" + +maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/src/engine/include/readEngineControls.H b/src/engine/include/readEngineControls.H new file mode 100644 index 0000000000..4497ef2116 --- /dev/null +++ b/src/engine/include/readEngineControls.H @@ -0,0 +1,3 @@ +#include "readDyMControls.H" + +maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/src/engine/include/readEngineTimeControls.H b/src/engine/include/readEngineTimeControls.H index cccee289dd..8d6d5f28b3 100644 --- a/src/engine/include/readEngineTimeControls.H +++ b/src/engine/include/readEngineTimeControls.H @@ -1,3 +1,3 @@ - #include "createTimeControls.H" + #include "readTimeControls.H" maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/src/functionObjects/field/Make/files b/src/functionObjects/field/Make/files index e24d4569f5..992fe8dc23 100644 --- a/src/functionObjects/field/Make/files +++ b/src/functionObjects/field/Make/files @@ -13,7 +13,6 @@ fieldValues/surfaceFieldValue/surfaceFieldValue.C nearWallFields/nearWallFields.C nearWallFields/findCellParticle.C -nearWallFields/findCellParticleCloud.C processorField/processorField.C readFields/readFields.C diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.C b/src/functionObjects/field/streamLine/streamLineParticleCloud.C index efd9848879..cb6993cd3e 100644 --- a/src/functionObjects/field/streamLine/streamLineParticleCloud.C +++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License namespace Foam { - defineTemplateTypeNameAndDebug(Cloud, 0); + defineTypeNameAndDebug(streamLineParticleCloud, 0); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/functionObjects/field/streamLine/streamLineParticleCloud.H index 65fb4b9d4d..6bb1996dba 100644 --- a/src/functionObjects/field/streamLine/streamLineParticleCloud.H +++ b/src/functionObjects/field/streamLine/streamLineParticleCloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,6 +56,11 @@ public: //- Type of parcel the cloud was instantiated for typedef streamLineParticle parcelType; + + //- Runtime type information + TypeName("streamLineParticleCloud"); + + // Constructors //- Construct given mesh diff --git a/src/functionObjects/lagrangian/Make/options b/src/functionObjects/lagrangian/Make/options index ae5045e54d..23da67464c 100644 --- a/src/functionObjects/lagrangian/Make/options +++ b/src/functionObjects/lagrangian/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude @@ -13,7 +13,7 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lmeshTools \ -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ + -llagrangianParcel \ + -llagrangianParcelTurbulence \ -lregionModels \ -lsurfaceFilmModels diff --git a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C index b5f51d44af..495754d02c 100644 --- a/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C +++ b/src/functionObjects/lagrangian/cloudInfo/cloudInfo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "cloudInfo.H" -#include "kinematicCloud.H" +#include "parcelCloud.H" #include "dictionary.H" #include "PstreamReduceOps.H" #include "addToRunTimeSelectionTable.H" @@ -122,8 +122,7 @@ bool Foam::functionObjects::cloudInfo::write() { const word& cloudName = names()[i]; - const kinematicCloud& cloud = - obr_.lookupObject(cloudName); + const parcelCloud& cloud = obr_.lookupObject(cloudName); label nParcels = returnReduce(cloud.nParcels(), sumOp