Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
fb76b98a
Commit
fb76b98a
authored
Nov 08, 2011
by
mattijs
Browse files
Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
parents
83ec8559
76cf75f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/chemFoam/readInitialConditions.H
View file @
fb76b98a
word
constProp
(
initialConditions
.
lookup
(
"constantProperty"
));
if
(
constProp
==
"pressure"
||
constProp
==
"volume"
)
{
Info
<<
constProp
<<
" will be held constant."
<<
nl
<<
" p = "
<<
p
[
0
]
<<
" [Pa]"
<<
nl
<<
" T = "
<<
thermo
.
T
()[
0
]
<<
" [K] "
<<
nl
<<
" rho = "
<<
rho
[
0
]
<<
" [kg/m3]"
<<
nl
<<
endl
;
}
else
if
((
constProp
!=
"pressure"
)
&&
(
constProp
!=
"volume"
))
{
FatalError
<<
"in initialConditions, unknown constantProperty type "
<<
constProp
<<
nl
<<
" Valid types are: pressure volume."
...
...
@@ -110,3 +102,10 @@
scalar
integratedHeat
=
0
.
0
;
Info
<<
constProp
<<
" will be held constant."
<<
nl
<<
" p = "
<<
p
[
0
]
<<
" [Pa]"
<<
nl
<<
" T = "
<<
thermo
.
T
()[
0
]
<<
" [K] "
<<
nl
<<
" rho = "
<<
rho
[
0
]
<<
" [kg/m3]"
<<
nl
<<
endl
;
src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
View file @
fb76b98a
...
...
@@ -80,12 +80,12 @@ void Foam::FacePostProcessing<CloudType>::write()
const
Time
&
time
=
mesh
.
time
();
const
faceZoneMesh
&
fzm
=
mesh
.
faceZones
();
scalar
timeNew
=
time
.
value
();
scalar
timeElapsed
=
timeNew
-
timeOld_
;
scalar
timeElapsed
=
timeNew
-
timeOld_
;
totalTime_
+=
timeElapsed
;
const
scalar
alpha
=
(
totalTime_
-
timeElapsed
)
/
totalTime_
;
const
scalar
beta
=
timeElapsed
/
totalTime_
;
//correct
const
scalar
beta
=
timeElapsed
/
totalTime_
;
forAll
(
faceZoneIDs_
,
zoneI
)
{
...
...
@@ -96,7 +96,7 @@ void Foam::FacePostProcessing<CloudType>::write()
const
label
procI
=
Pstream
::
myProcNo
();
Info
<<
"particleFaceFlowRate
output:"
<<
nl
;
Info
<<
type
()
<<
"
output:"
<<
nl
;
List
<
scalarField
>
zoneMassTotal
(
mass_
.
size
());
List
<
scalarField
>
zoneMassFlowRate
(
massFlowRate_
.
size
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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