Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
054f0415
Commit
054f0415
authored
9 years ago
by
Kilian Weishaupt
Committed by
Thomas Fetzer
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[brine] Fix
*Add missing function
parent
cd9222df
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!110
Feature/fs291 solutes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dumux/material/fluidsystems/brineair.hh
+15
-6
15 additions, 6 deletions
dumux/material/fluidsystems/brineair.hh
with
15 additions
and
6 deletions
dumux/material/fluidsystems/brineair.hh
+
15
−
6
View file @
054f0415
...
...
@@ -377,11 +377,9 @@ public:
switch
(
phaseIdx
)
{
case
lPhaseIdx
:
return
liquidDensity_
(
temperature
,
pressure
,
fluidState
.
moleFraction
(
lPhaseIdx
,
AirIdx
),
fluidState
.
moleFraction
(
lPhaseIdx
,
H2OIdx
),
fluidState
.
massFraction
(
lPhaseIdx
,
NaClIdx
));
return
Brine
::
liquidDensity
(
temperature
,
pressure
,
fluidState
.
massFraction
(
lPhaseIdx
,
NaClIdx
));
case
gPhaseIdx
:
return
gasDensity_
(
temperature
,
pressure
,
...
...
@@ -475,7 +473,7 @@ public:
else
if
(
phaseIdx
==
lPhaseIdx
)
{
if
(
compIdx
==
H2OIdx
)
return
vaporPressure
_
(
T
,
fluidState
.
moleFraction
(
lPhaseIdx
,
NaClIdx
)
)
/
p
;
return
Brine
::
vaporPressure
(
T
)
/
p
;
else
if
(
compIdx
==
AirIdx
)
return
Dumux
::
BinaryCoeff
::
H2O_Air
::
henry
(
T
)
/
p
;
else
...
...
@@ -697,6 +695,17 @@ public:
return
Brine_Air
::
molalityNaCl
(
salinity
);
// massfraction
}
private
:
static
Scalar
gasDensity_
(
Scalar
T
,
Scalar
pg
,
Scalar
xgH2O
)
{
//Dalton' Law
const
Scalar
pH2O
=
xgH2O
*
pg
;
const
Scalar
pAir
=
pg
-
pH2O
;
const
Scalar
gasDensityAir
=
Air
::
gasDensity
(
T
,
pAir
);
const
Scalar
gasDensityH2O
=
H2O
::
gasDensity
(
T
,
pH2O
);
const
Scalar
gasDensity
=
gasDensityAir
+
gasDensityH2O
;
return
gasDensity
;
}
};
}
// end namespace
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment