diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 96209bde82..bbb730bb62 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -36,13 +36,72 @@ License #include "PostProcessingModel.H" #include "SurfaceFilmModel.H" +// * * * * * * * * * * * * * * cloudSolution * * * * * * * * * * * * * * * * // + +template +void Foam::KinematicCloud::cloudSolution::read() +{ + dict_.lookup("coupled") >> coupled_; +} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const fvMesh& mesh, + const dictionary& dict +) +: + mesh_(mesh), + dict_(dict), + active_(dict.lookup("active")), + coupled_(false) +{ + if (active_) + { + read(); + } +} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const cloudSolution& cs +) +: + mesh_(cs.mesh_), + dict_(cs.dict_), + active_(cs.active_), + coupled_(cs.coupled_) +{} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const fvMesh& mesh +) +: + mesh_(mesh), + dict_(dictionary::null), + active_(false), + coupled_(false) +{} + + +template +Foam::KinematicCloud::cloudSolution::~cloudSolution() +{} + + // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // template void Foam::KinematicCloud::preEvolve() { this->dispersion().cacheFields(true); - forces_.cacheFields(true, interpolationSchemes_); + forces_.cacheFields(true, solution_.interpolationSchemes()); updateCellOccupancy(); } @@ -98,21 +157,21 @@ void Foam::KinematicCloud::evolveCloud() autoPtr > rhoInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), rho_ ); autoPtr > UInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), U_ ); autoPtr > muInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), mu_ ); @@ -141,7 +200,7 @@ void Foam::KinematicCloud::evolveCloud() this->injection().inject(td); - if (coupled_) + if (solution_.coupled()) { resetSourceTerms(); } @@ -223,7 +282,7 @@ void Foam::KinematicCloud::postEvolve() } this->dispersion().cacheFields(false); - forces_.cacheFields(false, interpolationSchemes_); + forces_.cacheFields(false, solution_.interpolationSchemes()); this->postProcessing().post(); } @@ -256,11 +315,10 @@ Foam::KinematicCloud::KinematicCloud IOobject::NO_WRITE ) ), + solution_(mesh_, particleProperties_.subDict("solution")), constProps_(particleProperties_), subModelProperties_(particleProperties_.subDict("subModels")), - active_(particleProperties_.lookup("active")), parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))), - coupled_(particleProperties_.lookup("coupled")), cellValueSourceCorrection_ ( particleProperties_.lookup("cellValueSourceCorrection") @@ -272,7 +330,6 @@ Foam::KinematicCloud::KinematicCloud mu_(mu), g_(g), forces_(mesh_, particleProperties_, g_.value()), - interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")), dispersionModel_ ( DispersionModel >::New @@ -335,7 +392,7 @@ Foam::KinematicCloud::KinematicCloud vectorIntegrationScheme::New ( "U", - particleProperties_.subDict("integrationSchemes") + solution_.integrationSchemes() ) ), UTrans_ @@ -397,7 +454,7 @@ void Foam::KinematicCloud::resetSourceTerms() template void Foam::KinematicCloud::evolve() { - if (active_) + if (solution_.active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index 9138688a13..e86954ef81 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -105,6 +105,83 @@ class KinematicCloud void operator=(const KinematicCloud&); +public: + + // Cloud solution helper class + class cloudSolution + { + // Private Data + + //- Reference to the mesh + const fvMesh& mesh_; + + //- Dictionary used during construction + dictionary dict_; + + //- Cloud active flag + const Switch active_; + + + // Run-time options + + //- Flag to indicate whether parcels are coupled to the carrier + // phase, i.e. whether or not to generate source terms for + // carrier phase + Switch coupled_; + + //- Flag to correct cell values with latest transfer information + // during the lagrangian timestep + Switch cellValueSourceCorrection_; + + + public: + + // Constructors + + //- Construct null from mesh reference + cloudSolution(const fvMesh& mesh); + + //- Construct from mesh and dictionary + cloudSolution(const fvMesh& mesh, const dictionary& dict); + + //- Construct copy + cloudSolution(const cloudSolution& cs); + + + //- Destructor + virtual ~cloudSolution(); + + + // Member functions + + //- Read properties from dictionary + void read(); + + // Access + + //- Return reference to the mesh + inline const fvMesh& mesh() const; + + //- Return const access to the dictionary + inline const dictionary& dict() const; + + //- Return the active flag + inline const Switch active() const; + + //- Return const access to the coupled flag + inline const Switch coupled() const; + + //- Return const access to the cell value correction flag + inline const Switch cellValueSourceCorrection() const; + + //- Interpolation schemes dictionary + inline const dictionary& interpolationSchemes() const; + + //- Integration schemes dictionary + inline const dictionary& integrationSchemes() const; + }; + + protected: // Protected data @@ -115,23 +192,19 @@ protected: //- Dictionary of particle properties IOdictionary particleProperties_; - //- Sub-models dictionary - const dictionary& subModelProperties_; + //- Solution properties + cloudSolution solution_; //- Parcel constant properties typename ParcelType::constantProperties constProps_; - //- Cloud active flag - const Switch active_; + //- Sub-models dictionary + const dictionary& subModelProperties_; //- Parcel type id - used to flag the type of parcels issued by this // cloud const label parcelTypeId_; - //- Flag to indicate whether parcels are coupled to the carrier phase - // i.e. whether or not to generate source terms for carrier phase - const Switch coupled_; - //- Flag to correct cell values with latest transfer information // during the lagrangian timestep const Switch cellValueSourceCorrection_; @@ -164,9 +237,6 @@ protected: //- Optional particle forces particleForces forces_; - //- Interpolation schemes dictionary - dictionary interpolationSchemes_; - // References to the cloud sub-models @@ -278,28 +348,22 @@ public: //- Return particle properties dictionary inline const IOdictionary& particleProperties() const; - //- Return reference to the sub-models dictionary - inline const dictionary& subModelProperties() const; + //- Return const access to the solution properties + inline const cloudSolution& solution() const; //- Return the constant properties inline const typename ParcelType::constantProperties& constProps() const; + //- Return reference to the sub-models dictionary + inline const dictionary& subModelProperties() const; + // Cloud data - //- Return the active flag - inline const Switch active() const; - //- Return the parcel type id inline label parcelTypeId() const; - //- Return coupled flag - inline const Switch coupled() const; - - //- Return cell value correction flag - inline const Switch cellValueSourceCorrection() const; - //- Return refernce to the random object inline Random& rndGen(); @@ -332,12 +396,6 @@ public: inline const particleForces& forces() const; - // Interpolations - - //- Return reference to the interpolation dictionary - inline const dictionary& interpolationSchemes() const; - - // Sub-models //- Return const-access to the dispersion model diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 3bbc78c905..7a924d6c65 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -25,6 +25,65 @@ License #include "fvmSup.H" +// * * * * * * * * * * * cloudSolution Member Functions * * * * * * * * * * // + +template +inline const Foam::fvMesh& +Foam::KinematicCloud::cloudSolution::mesh() const +{ + return mesh_; +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::dict() const +{ + return dict_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::active() const +{ + return active_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::coupled() const +{ + return coupled_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::cellValueSourceCorrection() +const +{ + return cellValueSourceCorrection_; +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::interpolationSchemes() const +{ + return dict_.subDict("interpolationSchemes"); +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::integrationSchemes() const +{ + return dict_.subDict("integrationSchemes"); +} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template @@ -57,10 +116,10 @@ Foam::KinematicCloud::particleProperties() const template -inline const Foam::dictionary& -Foam::KinematicCloud::subModelProperties() const +inline const typename Foam::KinematicCloud::cloudSolution& +Foam::KinematicCloud::solution() const { - return subModelProperties_; + return solution_; } @@ -73,24 +132,10 @@ Foam::KinematicCloud::constProps() const template -inline const Foam::Switch Foam::KinematicCloud::active() const +inline const Foam::dictionary& +Foam::KinematicCloud::subModelProperties() const { - return active_; -} - - -template -inline const Foam::Switch Foam::KinematicCloud::coupled() const -{ - return coupled_; -} - - -template -inline const Foam::Switch -Foam::KinematicCloud::cellValueSourceCorrection() const -{ - return cellValueSourceCorrection_; + return subModelProperties_; } @@ -132,14 +177,6 @@ Foam::KinematicCloud::forces() const } -template -inline const Foam::dictionary& -Foam::KinematicCloud::interpolationSchemes() const -{ - return interpolationSchemes_; -} - - template inline const Foam::DispersionModel >& Foam::KinematicCloud::dispersion() const diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 2a54ef8672..8ddf9cc206 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -135,7 +135,7 @@ void Foam::ReactingCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -286,7 +286,7 @@ void Foam::ReactingCloud::resetSourceTerms() template void Foam::ReactingCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index 579191bc63..b8f4ebceef 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -46,37 +46,37 @@ void Foam::ReactingMultiphaseCloud::evolveCloud() autoPtr > rhoInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->rho() ); autoPtr > UInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->U() ); autoPtr > muInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->mu() ); autoPtr > TInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), T ); autoPtr > cpInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), cp ); autoPtr > pInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), p ); @@ -108,7 +108,7 @@ void Foam::ReactingMultiphaseCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -245,7 +245,7 @@ void Foam::ReactingMultiphaseCloud::resetSourceTerms() template void Foam::ReactingMultiphaseCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index f141c29f7b..8571238db1 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -46,31 +46,31 @@ void Foam::ThermoCloud::evolveCloud() autoPtr > rhoInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->rho() ); autoPtr > UInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->U() ); autoPtr > muInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->mu() ); autoPtr > TInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), T ); autoPtr > cpInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), cp ); @@ -101,7 +101,7 @@ void Foam::ThermoCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -167,7 +167,7 @@ Foam::ThermoCloud::ThermoCloud scalarIntegrationScheme::New ( "T", - this->particleProperties().subDict("integrationSchemes") + this->solution().integrationSchemes() ) ), radiation_(this->particleProperties().lookup("radiation")), @@ -236,7 +236,7 @@ void Foam::ThermoCloud::resetSourceTerms() template void Foam::ThermoCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index a8907205ce..c5d2f37d61 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -123,7 +123,7 @@ Foam::ThermoCloud::Ep() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& Ep = tEp().internalField(); const scalarField& V = this->mesh().V(); @@ -166,7 +166,7 @@ Foam::ThermoCloud::ap() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& ap = tap().internalField(); const scalarField& V = this->mesh().V(); @@ -209,7 +209,7 @@ Foam::ThermoCloud::sigmap() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& sigmap = tsigmap().internalField(); diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index f6ba6aeed3..4cd8e6df9b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -127,7 +127,7 @@ void Foam::KinematicParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Update momentum transfer td.cloud().UTrans()[cellI] += np0*dUTrans; @@ -301,7 +301,7 @@ bool Foam::KinematicParcel::move(TrackData& td) // Update cell based properties p.setCellValues(td, dt, cellI); - if (td.cloud().cellValueSourceCorrection()) + if (td.cloud().solution().cellValueSourceCorrection()) { p.cellValueSourceCorrection(td, dt, cellI); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 1deed776b9..e77064c5a1 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -387,7 +387,7 @@ void Foam::ReactingMultiphaseParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Transfer mass lost from particle to carrier mass source forAll(YGas_, i) @@ -428,7 +428,7 @@ void Foam::ReactingMultiphaseParcel::calc { td.keepParticle = false; - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Absorb parcel into carrier phase forAll(YGas_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index f032198856..edd2b8e678 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -333,7 +333,7 @@ void Foam::ReactingParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Transfer mass lost from particle to carrier mass source forAll(dMassPC, i) @@ -356,7 +356,7 @@ void Foam::ReactingParcel::calc { td.keepParticle = false; - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Absorb parcel into carrier phase forAll(Y_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index dbcc01ad2a..d04caf8cfc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -193,7 +193,7 @@ void Foam::ThermoParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Update momentum transfer td.cloud().UTrans()[cellI] += np0*dUTrans; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 6ad5bec888..c965f964c8 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation on; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume true; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 8b4207b192..0524272eb6 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -15,14 +15,30 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + mu cell; + U cellPoint; + Cp cell; + T cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation on; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 2; constantProperties @@ -40,21 +56,6 @@ constantProperties Pr 0.7; } -interpolationSchemes -{ - rho cell; - mu cell; - U cellPoint; - Cp cell; - T cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 464ed8f5e5..8244491a54 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 82e218b5a2..5a4ad7e915 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled false; + cellValueSourceCorrection off; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Euler; + } +} radiation off; -coupled false; - -cellValueSourceCorrection off; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Euler; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 83dc18816a..4c127591eb 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties index da06cb5025..33a3f9916d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active false; // true; +solution +{ + active false; // true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties poissonsRatio 0; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 41d7d0ea06..50a9d54746 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index c2f0120ecd..4eaa668310 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties index eeb34eafa1..dc73bbf25d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active false; // true; +solution +{ + active false; // true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 7860f48964..33aba59d3e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity off; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 0a2e6e40cc..29fccecae6 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -15,11 +15,24 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; -coupled true; + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + } -cellValueSourceCorrection on; + integrationSchemes + { + U Euler; + } +} parcelTypeId 2; @@ -32,18 +45,6 @@ constantProperties poissonsRatio 0.35; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; -} - -integrationSchemes -{ - U Euler; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 9f3b816eb3..6ab1d7eb67 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -15,14 +15,30 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + mu cell; + U cellPoint; + T cell; + Cp cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -40,21 +56,6 @@ constantProperties Pr 0.7; } -interpolationSchemes -{ - rho cell; - mu cell; - U cellPoint; - T cell; - Cp cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on;