diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 7808407cab86946cb322e1e15eefa92ac1461fa5..6326b4c2d853de0624f1a424d0f294b8e1aae6c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,7 +37,7 @@ Foam::label Foam::KinematicLookupTableInjection<CloudType>::parcelsToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
- return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+ return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
}
else
{
@@ -78,7 +78,7 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
InjectionModel<CloudType>(dict, owner, typeName),
inputFileName_(this->coeffDict().lookup("inputFile")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
- nParcelsPerSecond_
+ parcelsPerSecond_
(
readScalar(this->coeffDict().lookup("parcelsPerSecond"))
),
@@ -132,7 +132,7 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
InjectionModel<CloudType>(im),
inputFileName_(im.inputFileName_),
duration_(im.duration_),
- nParcelsPerSecond_(im.nParcelsPerSecond_),
+ parcelsPerSecond_(im.parcelsPerSecond_),
injectors_(im.injectors_),
injectorCells_(im.injectorCells_),
injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 242797a12023c9820f096382740783d1b60bd87a..86038d90cf9db62d650642d09e723a993890a0b4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -76,7 +76,7 @@ class KinematicLookupTableInjection
const scalar duration_;
//- Number of parcels per injector - common to all injection sources
- const label nParcelsPerSecond_;
+ const scalar parcelsPerSecond_;
//- List of injectors
kinematicParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 761ce13fcc5782e973959e395fec47ada2680e10..39d1fe6096d04a437d16bd825c9b11357727c3b4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ Foam::label Foam::ReactingLookupTableInjection<CloudType>::parcelsToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
- return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+ return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
}
else
{
@@ -77,7 +77,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
InjectionModel<CloudType>(dict, owner, typeName),
inputFileName_(this->coeffDict().lookup("inputFile")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
- nParcelsPerSecond_
+ parcelsPerSecond_
(
readScalar(this->coeffDict().lookup("parcelsPerSecond"))
),
@@ -131,7 +131,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
InjectionModel<CloudType>(im),
inputFileName_(im.inputFileName_),
duration_(im.duration_),
- nParcelsPerSecond_(im.nParcelsPerSecond_),
+ parcelsPerSecond_(im.parcelsPerSecond_),
injectors_(im.injectors_),
injectorCells_(im.injectorCells_),
injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index d132886b1acd384677bc751dff1a740f82c54436..955ab3c7d8233e07b1eb06ec20d986056edfaf66 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -79,7 +79,7 @@ class ReactingLookupTableInjection
const scalar duration_;
//- Number of parcels per injector - common to all injection sources
- const label nParcelsPerSecond_;
+ const scalar parcelsPerSecond_;
//- List of injectors
reactingParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index caf3acff4bd9f8c685ed968b4d42e4d3ccc8f265..fd7839b331e87ef0ff64775dfa49f6df10bbdd82 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,7 +37,7 @@ Foam::ReactingMultiphaseLookupTableInjection<CloudType>::parcelsToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
- return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+ return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
}
else
{
@@ -80,7 +80,7 @@ ReactingMultiphaseLookupTableInjection
InjectionModel<CloudType>(dict, owner, typeName),
inputFileName_(this->coeffDict().lookup("inputFile")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
- nParcelsPerSecond_
+ parcelsPerSecond_
(
readScalar(this->coeffDict().lookup("parcelsPerSecond"))
),
@@ -135,7 +135,7 @@ ReactingMultiphaseLookupTableInjection
InjectionModel<CloudType>(im),
inputFileName_(im.inputFileName_),
duration_(im.duration_),
- nParcelsPerSecond_(im.nParcelsPerSecond_),
+ parcelsPerSecond_(im.parcelsPerSecond_),
injectors_(im.injectors_),
injectorCells_(im.injectorCells_),
injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 00c8c187343d04500983b6041f409edc00328ff3..3ed279fd30217ca423ccc580b0f0a271f77e4ff5 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -82,7 +82,7 @@ class ReactingMultiphaseLookupTableInjection
const scalar duration_;
//- Number of parcels per injector - common to all injection sources
- const label nParcelsPerSecond_;
+ const scalar parcelsPerSecond_;
//- List of injectors
reactingMultiphaseParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index 5a4df7d0b38ca3003bbe72f3c3fbd1825d6363e9..8a59b2ec0dcd333d1b14c12d296dbbc13940e1f7 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,7 +37,7 @@ Foam::label Foam::ThermoLookupTableInjection<CloudType>::parcelsToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
- return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+ return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
}
else
{
@@ -78,7 +78,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
InjectionModel<CloudType>(dict, owner, typeName),
inputFileName_(this->coeffDict().lookup("inputFile")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
- nParcelsPerSecond_
+ parcelsPerSecond_
(
readScalar(this->coeffDict().lookup("parcelsPerSecond"))
),
@@ -132,7 +132,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
InjectionModel<CloudType>(im),
inputFileName_(im.inputFileName_),
duration_(im.duration_),
- nParcelsPerSecond_(im.nParcelsPerSecond_),
+ parcelsPerSecond_(im.parcelsPerSecond_),
injectors_(im.injectors_),
injectorCells_(im.injectorCells_),
injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index d3d5dfb9292747799273458cf6445daf208910ef..f9753b2a307a9f3c4a4eee3099b774083cb06d51 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -78,7 +78,7 @@ class ThermoLookupTableInjection
const scalar duration_;
//- Number of parcels per injector - common to all injection sources
- const label nParcelsPerSecond_;
+ const scalar parcelsPerSecond_;
//- List of injectors
kinematicParcelInjectionDataIOList injectors_;