Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
c1a61968
Commit
c1a61968
authored
May 06, 2011
by
andy
Browse files
BUG: Specify parcels per second as scalar instead of label
parent
2ac00834
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
View file @
c1a61968
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-201
1
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
)
*
nP
arcelsPerSecond_
);
return
floor
(
injectorCells_
.
size
()
*
(
time1
-
time0
)
*
p
arcelsPerSecond_
);
}
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"
))),
nP
arcelsPerSecond_
p
arcelsPerSecond_
(
readScalar
(
this
->
coeffDict
().
lookup
(
"parcelsPerSecond"
))
),
...
...
@@ -132,7 +132,7 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
InjectionModel
<
CloudType
>
(
im
),
inputFileName_
(
im
.
inputFileName_
),
duration_
(
im
.
duration_
),
nP
arcelsPerSecond_
(
im
.
nP
arcelsPerSecond_
),
p
arcelsPerSecond_
(
im
.
p
arcelsPerSecond_
),
injectors_
(
im
.
injectors_
),
injectorCells_
(
im
.
injectorCells_
),
injectorTetFaces_
(
im
.
injectorTetFaces_
),
...
...
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
View file @
c1a61968
...
...
@@ -76,7 +76,7 @@ class KinematicLookupTableInjection
const
scalar
duration_
;
//- Number of parcels per injector - common to all injection sources
const
label
nP
arcelsPerSecond_
;
const
scalar
p
arcelsPerSecond_
;
//- List of injectors
kinematicParcelInjectionDataIOList
injectors_
;
...
...
src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
View file @
c1a61968
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-201
1
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
)
*
nP
arcelsPerSecond_
);
return
floor
(
injectorCells_
.
size
()
*
(
time1
-
time0
)
*
p
arcelsPerSecond_
);
}
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"
))),
nP
arcelsPerSecond_
p
arcelsPerSecond_
(
readScalar
(
this
->
coeffDict
().
lookup
(
"parcelsPerSecond"
))
),
...
...
@@ -131,7 +131,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
InjectionModel
<
CloudType
>
(
im
),
inputFileName_
(
im
.
inputFileName_
),
duration_
(
im
.
duration_
),
nP
arcelsPerSecond_
(
im
.
nP
arcelsPerSecond_
),
p
arcelsPerSecond_
(
im
.
p
arcelsPerSecond_
),
injectors_
(
im
.
injectors_
),
injectorCells_
(
im
.
injectorCells_
),
injectorTetFaces_
(
im
.
injectorTetFaces_
),
...
...
src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
View file @
c1a61968
...
...
@@ -79,7 +79,7 @@ class ReactingLookupTableInjection
const
scalar
duration_
;
//- Number of parcels per injector - common to all injection sources
const
label
nP
arcelsPerSecond_
;
const
scalar
p
arcelsPerSecond_
;
//- List of injectors
reactingParcelInjectionDataIOList
injectors_
;
...
...
src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
View file @
c1a61968
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-201
1
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
)
*
nP
arcelsPerSecond_
);
return
floor
(
injectorCells_
.
size
()
*
(
time1
-
time0
)
*
p
arcelsPerSecond_
);
}
else
{
...
...
@@ -80,7 +80,7 @@ ReactingMultiphaseLookupTableInjection
InjectionModel
<
CloudType
>
(
dict
,
owner
,
typeName
),
inputFileName_
(
this
->
coeffDict
().
lookup
(
"inputFile"
)),
duration_
(
readScalar
(
this
->
coeffDict
().
lookup
(
"duration"
))),
nP
arcelsPerSecond_
p
arcelsPerSecond_
(
readScalar
(
this
->
coeffDict
().
lookup
(
"parcelsPerSecond"
))
),
...
...
@@ -135,7 +135,7 @@ ReactingMultiphaseLookupTableInjection
InjectionModel
<
CloudType
>
(
im
),
inputFileName_
(
im
.
inputFileName_
),
duration_
(
im
.
duration_
),
nP
arcelsPerSecond_
(
im
.
nP
arcelsPerSecond_
),
p
arcelsPerSecond_
(
im
.
p
arcelsPerSecond_
),
injectors_
(
im
.
injectors_
),
injectorCells_
(
im
.
injectorCells_
),
injectorTetFaces_
(
im
.
injectorTetFaces_
),
...
...
src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
View file @
c1a61968
...
...
@@ -82,7 +82,7 @@ class ReactingMultiphaseLookupTableInjection
const
scalar
duration_
;
//- Number of parcels per injector - common to all injection sources
const
label
nP
arcelsPerSecond_
;
const
scalar
p
arcelsPerSecond_
;
//- List of injectors
reactingMultiphaseParcelInjectionDataIOList
injectors_
;
...
...
src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
View file @
c1a61968
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-201
1
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
)
*
nP
arcelsPerSecond_
);
return
floor
(
injectorCells_
.
size
()
*
(
time1
-
time0
)
*
p
arcelsPerSecond_
);
}
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"
))),
nP
arcelsPerSecond_
p
arcelsPerSecond_
(
readScalar
(
this
->
coeffDict
().
lookup
(
"parcelsPerSecond"
))
),
...
...
@@ -132,7 +132,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
InjectionModel
<
CloudType
>
(
im
),
inputFileName_
(
im
.
inputFileName_
),
duration_
(
im
.
duration_
),
nP
arcelsPerSecond_
(
im
.
nP
arcelsPerSecond_
),
p
arcelsPerSecond_
(
im
.
p
arcelsPerSecond_
),
injectors_
(
im
.
injectors_
),
injectorCells_
(
im
.
injectorCells_
),
injectorTetFaces_
(
im
.
injectorTetFaces_
),
...
...
src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
View file @
c1a61968
...
...
@@ -78,7 +78,7 @@ class ThermoLookupTableInjection
const
scalar
duration_
;
//- Number of parcels per injector - common to all injection sources
const
label
nP
arcelsPerSecond_
;
const
scalar
p
arcelsPerSecond_
;
//- List of injectors
kinematicParcelInjectionDataIOList
injectors_
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment