diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C index 7808407cab..6326b4c2d8 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::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::KinematicLookupTableInjection InjectionModel(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::KinematicLookupTableInjection InjectionModel(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 242797a120..86038d90cf 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 761ce13fcc..39d1fe6096 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::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::ReactingLookupTableInjection InjectionModel(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::ReactingLookupTableInjection InjectionModel(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 d132886b1a..955ab3c7d8 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 caf3acff4b..fd7839b331 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::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(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(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 00c8c18734..3ed279fd30 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 5a4df7d0b3..8a59b2ec0d 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::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::ThermoLookupTableInjection InjectionModel(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::ThermoLookupTableInjection InjectionModel(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 d3d5dfb929..f9753b2a30 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_;