lagrangian: Simplified and rationalised SLGThermo pending a more general and extensible replacement
The reduced SLGThermo has been renamed parcelThermo to better represent the purpose. parcelThermo is not created and stored in the cloud that requires it rather than requiring it to be created in the solver createFields and passed to the cloud on construction.
This commit is contained in:
@ -1,2 +1,2 @@
|
||||
Info<< "\nConstructing clouds" << endl;
|
||||
parcelCloudList parcels(rho, U, g, slgThermo);
|
||||
parcelCloudList parcels(rho, U, g, thermo);
|
||||
|
||||
@ -3,8 +3,6 @@ autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
|
||||
fluidReactionThermo& thermo = pThermo();
|
||||
thermo.validate(args.executable(), "h", "e");
|
||||
|
||||
SLGThermo slgThermo(mesh, thermo);
|
||||
|
||||
basicSpecieMixture& composition = thermo.composition();
|
||||
PtrList<volScalarField>& Y = composition.Y();
|
||||
|
||||
|
||||
@ -35,7 +35,6 @@ Description
|
||||
#include "fluidReactionThermophysicalTransportModel.H"
|
||||
#include "parcelCloudList.H"
|
||||
#include "surfaceFilmModel.H"
|
||||
#include "SLGThermo.H"
|
||||
#include "fluidReactionThermo.H"
|
||||
#include "combustionModel.H"
|
||||
#include "pimpleControl.H"
|
||||
|
||||
@ -37,7 +37,6 @@ Description
|
||||
#include "parcelCloudList.H"
|
||||
#include "surfaceFilmModel.H"
|
||||
#include "combustionModel.H"
|
||||
#include "SLGThermo.H"
|
||||
#include "fvModels.H"
|
||||
#include "fvConstraints.H"
|
||||
#include "pimpleControl.H"
|
||||
|
||||
@ -5,8 +5,6 @@ autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
|
||||
fluidReactionThermo& thermo = pThermo();
|
||||
thermo.validate(args.executable(), "h", "e");
|
||||
|
||||
SLGThermo slgThermo(mesh, thermo);
|
||||
|
||||
basicSpecieMixture& composition = thermo.composition();
|
||||
PtrList<volScalarField>& Y = composition.Y();
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
Info<< "\nConstructing clouds" << endl;
|
||||
parcelCloudList clouds(rho, U, g, slgThermo);
|
||||
parcelCloudList clouds(rho, U, g, thermo);
|
||||
|
||||
@ -5,8 +5,6 @@ autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
|
||||
fluidReactionThermo& thermo = pThermo();
|
||||
thermo.validate(args.executable(), "h", "e");
|
||||
|
||||
SLGThermo slgThermo(mesh, thermo);
|
||||
|
||||
basicSpecieMixture& composition = thermo.composition();
|
||||
PtrList<volScalarField>& Y = composition.Y();
|
||||
|
||||
|
||||
@ -37,7 +37,6 @@ Description
|
||||
#include "parcelCloudList.H"
|
||||
#include "surfaceFilmModel.H"
|
||||
#include "combustionModel.H"
|
||||
#include "SLGThermo.H"
|
||||
#include "fvModels.H"
|
||||
#include "fvConstraints.H"
|
||||
#include "pimpleControl.H"
|
||||
|
||||
@ -37,7 +37,6 @@ Description
|
||||
#include "parcelCloudList.H"
|
||||
#include "surfaceFilmModel.H"
|
||||
#include "combustionModel.H"
|
||||
#include "SLGThermo.H"
|
||||
#include "fvModels.H"
|
||||
#include "fvConstraints.H"
|
||||
#include "pimpleControl.H"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
Info<< "\nConstructing clouds" << endl;
|
||||
parcelCloudList clouds(rho, U, g, slgThermo);
|
||||
parcelCloudList clouds(rho, U, g, thermo);
|
||||
|
||||
@ -5,8 +5,6 @@ autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
|
||||
fluidReactionThermo& thermo = pThermo();
|
||||
thermo.validate(args.executable(), "h", "e");
|
||||
|
||||
SLGThermo slgThermo(mesh, thermo);
|
||||
|
||||
basicSpecieMixture& composition = thermo.composition();
|
||||
PtrList<volScalarField>& Y = composition.Y();
|
||||
|
||||
|
||||
@ -39,7 +39,6 @@ Description
|
||||
#include "IOporosityModelList.H"
|
||||
#include "fvModels.H"
|
||||
#include "fvConstraints.H"
|
||||
#include "SLGThermo.H"
|
||||
#include "simpleControl.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
Reference in New Issue
Block a user