From 762508c822874299c203370c397823a0c2474a18 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 9 Apr 2010 11:44:56 +0100 Subject: [PATCH 1/2] ENH: added active flag to lagrangian/intermediate's SurfaceFilmModel --- .../SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C | 7 +++++++ .../SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index fdf6ff0e4f..8c78868648 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -39,6 +39,7 @@ Foam::SurfaceFilmModel::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::SurfaceFilmModel owner_(owner), g_(g), coeffDict_(dict.subDict(type + "Coeffs")), + active_(true), injectorCellsPatch_(0), massParcelPatch_(0), diameterParcelPatch_(0), @@ -85,6 +87,11 @@ template template void Foam::SurfaceFilmModel::inject(TrackData& td) { + if (!active_) + { + return; + } + // Retrieve the film model from the owner database const surfaceFilmModels::surfaceFilmModel& filmModel = this->owner().db().objectRegistry::lookupObject diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H index 145b1f421f..41d01f0eee 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H @@ -79,6 +79,9 @@ protected: //- The coefficients dictionary const dictionary coeffDict_; + //- Active flag + bool active_; + // Cached injector fields per film patch From 1fc97066c581f98c01927203cef31c5e5a0f88a6 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 9 Apr 2010 11:49:48 +0100 Subject: [PATCH 2/2] ENH: Updated lagrangian tutorials to reflect changes in lagrangian/intermediate library --- .../simplifiedSiwek/constant/coalCloud1Properties | 4 ++-- .../simplifiedSiwek/constant/limestoneCloud1Properties | 4 ++-- .../evaporationTest/constant/thermophysicalProperties | 2 +- .../simplifiedSiwek/constant/kinematicCloud1Properties | 4 ++-- .../simplifiedSiwek/constant/thermoCloud1Properties | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 93d2a24a89..a7c44e8f56 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -103,8 +103,8 @@ ManualInjectionCoeffs { minValue 5e-06; maxValue 0.0005; - d ( 5e-05 ); - n ( 0.5 ); + d 5e-05; + n 0.5; } } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 10d1ead7d1..c6c9779b01 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -88,8 +88,8 @@ ManualInjectionCoeffs { minValue 5e-06; maxValue 0.000565; - d ( 4.8e-05 ); - n ( 0.5 ); + d 4.8e-05; + n 0.5; } } } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties index aff4851a05..5a60774421 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hPsiMixtureThermo>; +thermoType hsPsiMixtureThermo>; chemistryReader foamChemistryReader; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 9e5cf7339a..50a06bdc51 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -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; } } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index eb85a8803a..ff44ccbd8e 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -88,8 +88,8 @@ ManualInjectionCoeffs { minValue 5e-06; maxValue 0.0005; - d ( 5e-05 ); - n ( 0.5 ); + d 5e-05; + n 0.5; } } }