songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into particleInteractions

Browse Source
This commit is contained in:
graham 2010-04-09 12:33:21 +01:00
commit ed3d9ef3eb
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
View File

@ -39,6 +39,7 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel(CloudType& owner)
owner_(owner),
g_(dimensionedVector("zero", dimAcceleration, vector::zero)),
coeffDict_(dictionary::null),
active_(false),
injectorCellsPatch_(0),
massParcelPatch_(0),
diameterParcelPatch_(0),
@ -62,6 +63,7 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel
owner_(owner),
g_(g),
coeffDict_(dict.subDict(type + "Coeffs")),
active_(true),
injectorCellsPatch_(0),
massParcelPatch_(0),
diameterParcelPatch_(0),
@ -85,6 +87,11 @@ template<class CloudType>
template<class TrackData>
void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
{
if (!active_)
{
return;
}
// Retrieve the film model from the owner database
const surfaceFilmModels::surfaceFilmModel& filmModel =
this->owner().db().objectRegistry::lookupObject

3
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
View File

@ -79,6 +79,9 @@ protected:
//- The coefficients dictionary
const dictionary coeffDict_;
//- Active flag
bool active_;
// Cached injector fields per film patch

4
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
View File

@ -107,8 +107,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.0005;
d ( 5e-05 );
n ( 0.5 );
d 5e-05;
n 0.5;
}
}
}

4
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
View File

@ -92,8 +92,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.000565;
d ( 4.8e-05 );
n ( 0.5 );
d 4.8e-05;
n 0.5;
}
}
}

2
tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
thermoType hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
chemistryReader foamChemistryReader;

4
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
View File

@ -75,8 +75,8 @@ ManualInjectionCoeffs
{
minValue 5e-05;
maxValue 0.0001;
d ( 7.5e-05 );
n ( 0.5 );
d 7.5e-05;
n 0.5;
}
}
}

4
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
View File

@ -88,8 +88,8 @@ ManualInjectionCoeffs
{
minValue 5e-06;
maxValue 0.0005;
d ( 5e-05 );
n ( 0.5 );
d 5e-05;
n 0.5;
}
}
}